Skip to content

Commit ee0b861

Browse files
Rebuild project
1 parent 15f4817 commit ee0b861

39 files changed

Lines changed: 14 additions & 18 deletions

AppFiles/cmake/empty.txt

Whitespace-only changes.

AppFiles/comp.bat

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ include_directories(include)
77
link_directories(${CMAKE_SOURCE_DIR}/lib)
88
include_directories(${CMAKE_BINARY_DIR}/include)
99

10-
INCLUDE(CMakeForceCompiler)
11-
CMAKE_FORCE_CXX_COMPILER(g++ GNU)
12-
10+
add_compile_options(-m64)
1311
set(ENGINE_NAME engine)
1412
set(CMAKE_CXX_STANDARD 17)
1513
set(CMAKE_CXX_STANDARD_REQUIRED True)
1614
set(CMAKE_CXX_FLAGS "-O4")
1715
set(BUILD_SHARED_LIBS True)
18-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
19-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
16+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
17+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
2018
set(CMAKE_BUILD_TYPE Release)
2119

2220
find_package(OpenGL REQUIRED)
@@ -26,27 +24,27 @@ find_package(GLFW3 REQUIRED)
2624
find_package(ASSIMP REQUIRED)
2725
find_package(Freetype REQUIRED)
2826

29-
set(LIBS glfw3 gdi32 opengl32 glew32 assimp zlibstatic)
27+
set(LIBS glfw gdi32 opengl32 glew32 assimp zlibstatic)
3028

3129
include_directories(
3230
"${CMAKE_SOURCE_DIR}/src"
3331
"${CMAKE_SOURCE_DIR}/include"
3432
)
3533

3634
#make stb_image lib
37-
add_library(stb_image ${CMAKE_SOURCE_DIR}/../../src/stb_image.cpp)
35+
add_library(stb_image ${CMAKE_SOURCE_DIR}/src/stb_image.cpp)
3836
set(LIBS ${LIBS} stb_image)
3937

4038
#make engine lib
41-
file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../../src/engine/*.cpp)
39+
file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/engine/*.cpp)
4240
add_library(${ENGINE_NAME} ${SOURCES})
4341

4442
set(LIBS ${LIBS} ${FREETYPE_LIBRARIES})
4543
target_link_libraries(${ENGINE_NAME} ${LIBS})
4644
target_include_directories(${ENGINE_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
4745

4846
#make exe file
49-
file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../src/*.cpp)
47+
file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/generator/*.cpp)
5048
add_executable(${PROJECT_NAME} ${SOURCES})
5149

5250
target_link_libraries(

build/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.dll
2+
*.exe
File renamed without changes.

0 commit comments

Comments
 (0)