Rebuild project

stanfortonski · Jul 19, 2020 · ee0b861 · ee0b861
1 parent 15f4817
commit ee0b861
Show file tree

Hide file tree

Showing 39 changed files with 14 additions and 18 deletions.
diff --git a/AppFiles/cmake/empty.txt b/AppFiles/cmake/empty.txt
diff --git a/AppFiles/comp.bat b/AppFiles/comp.bat
diff --git a/AppFiles/CMakeLists.txt → CMakeLists.txt b/AppFiles/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)
 
 find_package(OpenGL REQUIRED)
@@ -26,27 +24,27 @@ 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)
+file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/generator/*.cpp)
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 target_link_libraries(

diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1,2 @@
+*.dll
+*.exe
diff --git a/AppFiles/build/fonts/arial.ttf → build/fonts/arial.ttf b/AppFiles/build/fonts/arial.ttf → build/fonts/arial.ttf
diff --git a/AppFiles/build/shaders/depth/depth.fs → build/shaders/depth/depth.fs b/AppFiles/build/shaders/depth/depth.fs → build/shaders/depth/depth.fs
diff --git a/AppFiles/build/shaders/depth/depth.gs → build/shaders/depth/depth.gs b/AppFiles/build/shaders/depth/depth.gs → build/shaders/depth/depth.gs
diff --git a/...ild/shaders/depth/terrain_eval_depth.glsl → build/shaders/depth/terrain_eval_depth.glsl b/...ild/shaders/depth/terrain_eval_depth.glsl → build/shaders/depth/terrain_eval_depth.glsl
diff --git a/AppFiles/build/shaders/effect/blur.fs → build/shaders/effect/blur.fs b/AppFiles/build/shaders/effect/blur.fs → build/shaders/effect/blur.fs
diff --git a/AppFiles/build/shaders/effect/blur.vs → build/shaders/effect/blur.vs b/AppFiles/build/shaders/effect/blur.vs → build/shaders/effect/blur.vs
diff --git a/AppFiles/build/shaders/effect/hdr.fs → build/shaders/effect/hdr.fs b/AppFiles/build/shaders/effect/hdr.fs → build/shaders/effect/hdr.fs
diff --git a/AppFiles/build/shaders/effect/hdr.vs → build/shaders/effect/hdr.vs b/AppFiles/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/AppFiles/build/shaders/font/font.fs → build/shaders/font/font.fs b/AppFiles/build/shaders/font/font.fs → build/shaders/font/font.fs
diff --git a/AppFiles/build/shaders/font/font.vs → build/shaders/font/font.vs b/AppFiles/build/shaders/font/font.vs → build/shaders/font/font.vs
diff --git a/AppFiles/build/shaders/skybox/skybox.fs → build/shaders/skybox/skybox.fs b/AppFiles/build/shaders/skybox/skybox.fs → build/shaders/skybox/skybox.fs
diff --git a/AppFiles/build/shaders/skybox/skybox.vs → build/shaders/skybox/skybox.vs b/AppFiles/build/shaders/skybox/skybox.vs → build/shaders/skybox/skybox.vs
diff --git a/AppFiles/build/shaders/terrain/terrain.fs → build/shaders/terrain/terrain.fs b/AppFiles/build/shaders/terrain/terrain.fs → build/shaders/terrain/terrain.fs
diff --git a/AppFiles/build/shaders/terrain/terrain.vs → build/shaders/terrain/terrain.vs b/AppFiles/build/shaders/terrain/terrain.vs → build/shaders/terrain/terrain.vs
diff --git a/...uild/shaders/terrain/terrain_control.glsl → build/shaders/terrain/terrain_control.glsl b/...uild/shaders/terrain/terrain_control.glsl → build/shaders/terrain/terrain_control.glsl
diff --git a/...s/build/shaders/terrain/terrain_eval.glsl → build/shaders/terrain/terrain_eval.glsl b/...s/build/shaders/terrain/terrain_eval.glsl → build/shaders/terrain/terrain_eval.glsl
diff --git a/AppFiles/build/shaders/water/water.fs → build/shaders/water/water.fs b/AppFiles/build/shaders/water/water.fs → build/shaders/water/water.fs
diff --git a/AppFiles/build/shaders/water/water.vs → build/shaders/water/water.vs b/AppFiles/build/shaders/water/water.vs → build/shaders/water/water.vs
diff --git a/AppFiles/build/textures/cubemap/nx.jpg → build/textures/cubemap/nx.jpg b/AppFiles/build/textures/cubemap/nx.jpg → build/textures/cubemap/nx.jpg
diff --git a/AppFiles/build/textures/cubemap/ny.jpg → build/textures/cubemap/ny.jpg b/AppFiles/build/textures/cubemap/ny.jpg → build/textures/cubemap/ny.jpg
diff --git a/AppFiles/build/textures/cubemap/nz.jpg → build/textures/cubemap/nz.jpg b/AppFiles/build/textures/cubemap/nz.jpg → build/textures/cubemap/nz.jpg
diff --git a/AppFiles/build/textures/cubemap/px.jpg → build/textures/cubemap/px.jpg b/AppFiles/build/textures/cubemap/px.jpg → build/textures/cubemap/px.jpg
diff --git a/AppFiles/build/textures/cubemap/py.jpg → build/textures/cubemap/py.jpg b/AppFiles/build/textures/cubemap/py.jpg → build/textures/cubemap/py.jpg
diff --git a/AppFiles/build/textures/cubemap/pz.jpg → build/textures/cubemap/pz.jpg b/AppFiles/build/textures/cubemap/pz.jpg → build/textures/cubemap/pz.jpg
diff --git a/AppFiles/build/textures/grass.jpg → build/textures/grass.jpg b/AppFiles/build/textures/grass.jpg → build/textures/grass.jpg
diff --git a/AppFiles/build/textures/stone.jpg → build/textures/stone.jpg b/AppFiles/build/textures/stone.jpg → build/textures/stone.jpg
diff --git a/AppFiles/build/textures/water-dudv.jpg → build/textures/water-dudv.jpg b/AppFiles/build/textures/water-dudv.jpg → build/textures/water-dudv.jpg
diff --git a/AppFiles/build/textures/water-normal.jpg → build/textures/water-normal.jpg b/AppFiles/build/textures/water-normal.jpg → build/textures/water-normal.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/AppFiles/src/TerrainApp.cpp → src/generator/TerrainApp.cpp b/AppFiles/src/TerrainApp.cpp → src/generator/TerrainApp.cpp
diff --git a/AppFiles/src/TerrainApp.hpp → src/generator/TerrainApp.hpp b/AppFiles/src/TerrainApp.hpp → src/generator/TerrainApp.hpp
diff --git a/AppFiles/src/main.cpp → src/generator/main.cpp b/AppFiles/src/main.cpp → src/generator/main.cpp