Skip to content

Commit

Permalink
bunch of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Kade-github committed Apr 15, 2024
1 parent 4edadc3 commit e5eb392
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 29 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build
on:
push:
jobs:
build-project:
name: Linux Build
runs-on: ubuntu-latest
steps:
- name: Install PugiXML
run: sudo apt-get install libpugixml-dev
- name: Install GLFW
run: sudo apt-get install libglfw3-dev
- name: Install Assimp
run: sudo apt-get install libassimp-dev
- name: Checkout
uses: actions/checkout@v4.1.2
- name: Configure and Build Project
uses: threeal/cmake-action@main
with:
c-compiler: clang
cxx-compiler: clang++
source-dir: ./src
- name: Upload Build Artifacts
uses: actions/upload-artifact@v2
with:
name: build
path: ./build
build-project-windows:
name: Windows Build
runs-on: windows-latest
steps:
- uses: lukka/get-cmake@latest
- name: Setup anew vcpkg
uses: lukka/run-vcpkg@v11
- name: Checkout
uses: actions/checkout@v4.1.2
- name: Run CMake consuming CMakePreset.json and run vcpkg to build packages
uses: lukka/run-cmake@v10
with:
cmakeListsTxtPath: ./src/CMakeLists.txt
configurePreset: 'release'
buildPreset: 'release'
- name: Upload Build Artifacts
uses: actions/upload-artifact@v2
with:
name: build
path: ./build
26 changes: 0 additions & 26 deletions .github/workflows/c-cpp.yml

This file was deleted.

12 changes: 12 additions & 0 deletions src/CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 2,

"configurePresets": [
{
"name": "release",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
}
}
]
}
2 changes: 0 additions & 2 deletions src/Engine/Objects/2DCamera.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "2DCamera.h"
#include <Game.h>
#include <imgui.h>
#include <Helpers/StringTools.h>

Camera2D::Camera2D(glm::vec3 pos) : GameObject(pos)
Expand Down Expand Up @@ -218,7 +217,6 @@ void Camera2D::UpdateFramebuffer()
glDisable(GL_SCISSOR_TEST);

glBindFramebuffer(GL_FRAMEBUFFER, 0);

}

void Camera2D::MouseClick(int button, glm::vec2 pos)
Expand Down
1 change: 0 additions & 1 deletion src/Game/Scenes/Gameplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <Objects/3DText.h>
#include <Objects/3DSprite.h>
#include <Game.h>
#include <imgui.h>
#include <Helpers/StringTools.h>
#include "../LightingManager.h"
#include "../MusicManager.h"
Expand Down
7 changes: 7 additions & 0 deletions src/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"dependencies": [
"pugixml",
"glfw3",
"assimp"
]
}

0 comments on commit e5eb392

Please sign in to comment.