Rebuild project

stanfortonski · Jul 19, 2020 · 9ceed7b · 9ceed7b
1 parent cebbe1e
commit 9ceed7b
Show file tree

Hide file tree

Showing 65 changed files with 16 additions and 20 deletions.
diff --git a/GameFiles/CMakeLists.txt → CMakeLists.txt b/GameFiles/CMakeLists.txt → CMakeLists.txt
@@ -7,16 +7,14 @@ include_directories(include)
 link_directories(${CMAKE_SOURCE_DIR}/lib)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
-INCLUDE(CMakeForceCompiler)
-CMAKE_FORCE_CXX_COMPILER(g++ GNU)
-
+add_compile_options(-m64)
 set(ENGINE_NAME engine)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_FLAGS "-O4")
 set(BUILD_SHARED_LIBS True)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
 set(CMAKE_BUILD_TYPE Release)
 
 if(MINGW)
@@ -33,28 +31,28 @@ find_package(GLFW3 REQUIRED)
 find_package(ASSIMP REQUIRED)
 find_package(Freetype REQUIRED)
 
-set(LIBS glfw3 gdi32 opengl32 glew32 assimp zlibstatic)
+set(LIBS glfw gdi32 opengl32 glew32 assimp zlibstatic)
 
 include_directories(
 	"${CMAKE_SOURCE_DIR}/src"
 	"${CMAKE_SOURCE_DIR}/include"
 )
 
 #make stb_image lib
-add_library(stb_image ${CMAKE_SOURCE_DIR}/../../src/stb_image.cpp)
+add_library(stb_image ${CMAKE_SOURCE_DIR}/src/stb_image.cpp)
 set(LIBS ${LIBS} stb_image)
 
 #make engine lib
-file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../../src/engine/*.cpp)
+file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/engine/*.cpp)
 add_library(${ENGINE_NAME} ${SOURCES})
 
 set(LIBS ${LIBS} ${FREETYPE_LIBRARIES})
 target_link_libraries(${ENGINE_NAME} ${LIBS})
 target_include_directories(${ENGINE_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
 
 #make exe file
-file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../src/*.cpp)
-add_executable(${PROJECT_NAME} ${SOURCES} ${CMAKE_SOURCE_DIR}/../src/app.rc)
+file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/game/*.cpp)
+add_executable(${PROJECT_NAME} ${SOURCES} ${CMAKE_SOURCE_DIR}/src/game/app.rc)
 
 target_link_libraries(
   ${PROJECT_NAME}

diff --git a/GameFiles/cmake/empty.txt b/GameFiles/cmake/empty.txt
diff --git a/GameFiles/comp.bat b/GameFiles/comp.bat
diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1,2 @@
+*.dll
+*.exe
diff --git a/GameFiles/build/fonts/Duo-Dunkel.ttf → build/fonts/Duo-Dunkel.ttf b/GameFiles/build/fonts/Duo-Dunkel.ttf → build/fonts/Duo-Dunkel.ttf
diff --git a/...Files/build/objects/stickman/stickman.fbx → build/objects/stickman/stickman.fbx b/...Files/build/objects/stickman/stickman.fbx → build/objects/stickman/stickman.fbx
diff --git a/GameFiles/build/objects/world/world.mtl → build/objects/world/world.mtl b/GameFiles/build/objects/world/world.mtl → build/objects/world/world.mtl
diff --git a/GameFiles/build/objects/world/world.obj → build/objects/world/world.obj b/GameFiles/build/objects/world/world.obj → build/objects/world/world.obj
diff --git a/GameFiles/build/shaders/anim.vs → build/shaders/anim.vs b/GameFiles/build/shaders/anim.vs → build/shaders/anim.vs
diff --git a/GameFiles/build/shaders/depth/anim_depth.vs → build/shaders/depth/anim_depth.vs b/GameFiles/build/shaders/depth/anim_depth.vs → build/shaders/depth/anim_depth.vs
diff --git a/GameFiles/build/shaders/depth/depth.fs → build/shaders/depth/depth.fs b/GameFiles/build/shaders/depth/depth.fs → build/shaders/depth/depth.fs
diff --git a/GameFiles/build/shaders/depth/depth.gs → build/shaders/depth/depth.gs b/GameFiles/build/shaders/depth/depth.gs → build/shaders/depth/depth.gs
diff --git a/GameFiles/build/shaders/depth/depth.vs → build/shaders/depth/depth.vs b/GameFiles/build/shaders/depth/depth.vs → build/shaders/depth/depth.vs
diff --git a/GameFiles/build/shaders/effect/blur.fs → build/shaders/effect/blur.fs b/GameFiles/build/shaders/effect/blur.fs → build/shaders/effect/blur.fs
diff --git a/GameFiles/build/shaders/effect/blur.vs → build/shaders/effect/blur.vs b/GameFiles/build/shaders/effect/blur.vs → build/shaders/effect/blur.vs
diff --git a/GameFiles/build/shaders/effect/hdr.fs → build/shaders/effect/hdr.fs b/GameFiles/build/shaders/effect/hdr.fs → build/shaders/effect/hdr.fs
diff --git a/GameFiles/build/shaders/effect/hdr.vs → build/shaders/effect/hdr.vs b/GameFiles/build/shaders/effect/hdr.vs → build/shaders/effect/hdr.vs
diff --git a/...es/build/shaders/effect/postprocessing.fs → build/shaders/effect/postprocessing.fs b/...es/build/shaders/effect/postprocessing.fs → build/shaders/effect/postprocessing.fs
diff --git a/...es/build/shaders/effect/postprocessing.vs → build/shaders/effect/postprocessing.vs b/...es/build/shaders/effect/postprocessing.vs → build/shaders/effect/postprocessing.vs
diff --git a/GameFiles/build/shaders/font/font.fs → build/shaders/font/font.fs b/GameFiles/build/shaders/font/font.fs → build/shaders/font/font.fs
diff --git a/GameFiles/build/shaders/font/font.vs → build/shaders/font/font.vs b/GameFiles/build/shaders/font/font.vs → build/shaders/font/font.vs
diff --git a/GameFiles/build/shaders/interface.fs → build/shaders/interface.fs b/GameFiles/build/shaders/interface.fs → build/shaders/interface.fs
diff --git a/GameFiles/build/shaders/interface.vs → build/shaders/interface.vs b/GameFiles/build/shaders/interface.vs → build/shaders/interface.vs
diff --git a/GameFiles/build/shaders/object.fs → build/shaders/object.fs b/GameFiles/build/shaders/object.fs → build/shaders/object.fs
diff --git a/GameFiles/build/shaders/object.vs → build/shaders/object.vs b/GameFiles/build/shaders/object.vs → build/shaders/object.vs
diff --git a/GameFiles/build/shaders/rain.fs → build/shaders/rain.fs b/GameFiles/build/shaders/rain.fs → build/shaders/rain.fs
diff --git a/GameFiles/build/shaders/rain.vs → build/shaders/rain.vs b/GameFiles/build/shaders/rain.vs → build/shaders/rain.vs
diff --git a/GameFiles/build/shaders/skybox.fs → build/shaders/skybox.fs b/GameFiles/build/shaders/skybox.fs → build/shaders/skybox.fs
diff --git a/GameFiles/build/shaders/skybox.vs → build/shaders/skybox.vs b/GameFiles/build/shaders/skybox.vs → build/shaders/skybox.vs
diff --git a/GameFiles/build/stickman.ico → build/stickman.ico b/GameFiles/build/stickman.ico → build/stickman.ico
diff --git a/GameFiles/build/textures/cubemap/nx.jpg → build/textures/cubemap/nx.jpg b/GameFiles/build/textures/cubemap/nx.jpg → build/textures/cubemap/nx.jpg
diff --git a/GameFiles/build/textures/cubemap/ny.jpg → build/textures/cubemap/ny.jpg b/GameFiles/build/textures/cubemap/ny.jpg → build/textures/cubemap/ny.jpg
diff --git a/GameFiles/build/textures/cubemap/nz.jpg → build/textures/cubemap/nz.jpg b/GameFiles/build/textures/cubemap/nz.jpg → build/textures/cubemap/nz.jpg
diff --git a/GameFiles/build/textures/cubemap/px.jpg → build/textures/cubemap/px.jpg b/GameFiles/build/textures/cubemap/px.jpg → build/textures/cubemap/px.jpg
diff --git a/GameFiles/build/textures/cubemap/py.jpg → build/textures/cubemap/py.jpg b/GameFiles/build/textures/cubemap/py.jpg → build/textures/cubemap/py.jpg
diff --git a/GameFiles/build/textures/cubemap/pz.jpg → build/textures/cubemap/pz.jpg b/GameFiles/build/textures/cubemap/pz.jpg → build/textures/cubemap/pz.jpg
diff --git a/comp.bat b/comp.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cmake -G "MinGW Makefiles" .
+mingw32-make
+pause
diff --git a/src/engine/support/TextureLoader.hpp b/src/engine/support/TextureLoader.hpp
@@ -6,7 +6,6 @@
 #include <stdexcept>
 #include <vector>
 #include <GL/glew.h>
-#include <GL/glext.h>
 #include <stb_image.h>
 #include "../Config.hpp"
 

diff --git a/GameFiles/src/Fight.cpp → src/game/Fight.cpp b/GameFiles/src/Fight.cpp → src/game/Fight.cpp
diff --git a/GameFiles/src/Fight.hpp → src/game/Fight.hpp b/GameFiles/src/Fight.hpp → src/game/Fight.hpp
diff --git a/GameFiles/src/FightCamera.cpp → src/game/FightCamera.cpp b/GameFiles/src/FightCamera.cpp → src/game/FightCamera.cpp
diff --git a/GameFiles/src/FightCamera.hpp → src/game/FightCamera.hpp b/GameFiles/src/FightCamera.hpp → src/game/FightCamera.hpp
diff --git a/GameFiles/src/Game.cpp → src/game/Game.cpp b/GameFiles/src/Game.cpp → src/game/Game.cpp
diff --git a/GameFiles/src/Game.hpp → src/game/Game.hpp b/GameFiles/src/Game.hpp → src/game/Game.hpp
diff --git a/GameFiles/src/GameInput.cpp → src/game/GameInput.cpp b/GameFiles/src/GameInput.cpp → src/game/GameInput.cpp
diff --git a/GameFiles/src/NPC.cpp → src/game/NPC.cpp b/GameFiles/src/NPC.cpp → src/game/NPC.cpp
diff --git a/GameFiles/src/NPC.hpp → src/game/NPC.hpp b/GameFiles/src/NPC.hpp → src/game/NPC.hpp
diff --git a/GameFiles/src/Player.cpp → src/game/Player.cpp b/GameFiles/src/Player.cpp → src/game/Player.cpp
diff --git a/GameFiles/src/Player.hpp → src/game/Player.hpp b/GameFiles/src/Player.hpp → src/game/Player.hpp
diff --git a/GameFiles/src/RainEffect.cpp → src/game/RainEffect.cpp b/GameFiles/src/RainEffect.cpp → src/game/RainEffect.cpp
diff --git a/GameFiles/src/RainEffect.hpp → src/game/RainEffect.hpp b/GameFiles/src/RainEffect.hpp → src/game/RainEffect.hpp
diff --git a/GameFiles/src/app.rc → src/game/app.rc b/GameFiles/src/app.rc → src/game/app.rc
@@ -1,6 +1,6 @@
 #ifndef APP_RC
 #define APP_RC 1
 
-MAINICON ICON "../build/stickman.ico"
+MAINICON ICON "../../build/stickman.ico"
 
 #endif
diff --git a/GameFiles/src/gui/Button.cpp → src/game/gui/Button.cpp b/GameFiles/src/gui/Button.cpp → src/game/gui/Button.cpp
diff --git a/GameFiles/src/gui/Button.hpp → src/game/gui/Button.hpp b/GameFiles/src/gui/Button.hpp → src/game/gui/Button.hpp
diff --git a/GameFiles/src/gui/GUI.cpp → src/game/gui/GUI.cpp b/GameFiles/src/gui/GUI.cpp → src/game/gui/GUI.cpp
diff --git a/GameFiles/src/gui/GUI.hpp → src/game/gui/GUI.hpp b/GameFiles/src/gui/GUI.hpp → src/game/gui/GUI.hpp
diff --git a/GameFiles/src/gui/Menu.cpp → src/game/gui/Menu.cpp b/GameFiles/src/gui/Menu.cpp → src/game/gui/Menu.cpp
diff --git a/GameFiles/src/gui/Menu.hpp → src/game/gui/Menu.hpp b/GameFiles/src/gui/Menu.hpp → src/game/gui/Menu.hpp
diff --git a/GameFiles/src/main.cpp → src/game/main.cpp b/GameFiles/src/main.cpp → src/game/main.cpp
diff --git a/GameFiles/src/stickman/StickMan.cpp → src/game/stickman/StickMan.cpp b/GameFiles/src/stickman/StickMan.cpp → src/game/stickman/StickMan.cpp
diff --git a/GameFiles/src/stickman/StickMan.hpp → src/game/stickman/StickMan.hpp b/GameFiles/src/stickman/StickMan.hpp → src/game/stickman/StickMan.hpp
diff --git a/GameFiles/src/stickman/StickManAnims.cpp → src/game/stickman/StickManAnims.cpp b/GameFiles/src/stickman/StickManAnims.cpp → src/game/stickman/StickManAnims.cpp
diff --git a/GameFiles/src/stickman/StickManAnims.hpp → src/game/stickman/StickManAnims.hpp b/GameFiles/src/stickman/StickManAnims.hpp → src/game/stickman/StickManAnims.hpp
diff --git a/GameFiles/src/stickman/StickManModel.cpp → src/game/stickman/StickManModel.cpp b/GameFiles/src/stickman/StickManModel.cpp → src/game/stickman/StickManModel.cpp
diff --git a/GameFiles/src/stickman/StickManModel.hpp → src/game/stickman/StickManModel.hpp b/GameFiles/src/stickman/StickManModel.hpp → src/game/stickman/StickManModel.hpp