3 changed files with 7 additions and 3 deletions
+ 1
- 2
CMakeLists.txt
View File
| @@ -24,7 +24,7 @@ endif() | |||
| add_subdirectory(third_party) | |||
| set(libraries imgui SDL2 SDL2_image dl z) | |||
| set(libraries imgui SDL2 SDL2_image dl z) | |||
| # We want to be able to use C++20 designated initializers, | |||
| # but Clang doesn't support them yet. | |||
| @@ -32,7 +32,6 @@ set(libraries imgui SDL2 SDL2_image dl z) | |||
| add_compile_options(-Wno-c99-extensions) | |||
| include_directories( | |||
| ${PROJECT_SOURCE_DIR}/libswan/include | |||
| ${PROJECT_SOURCE_DIR}/third_party) | |||
| set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib64;${CMAKE_INSTALL_PREFIX}/swan/libswan;${CMAKE_INSTALL_PREFIX}/swan/third_party") | |||
+ 3
- 1
libswan/CMakeLists.txt
View File
| @@ -12,7 +12,9 @@ add_library(libswan SHARED | |||
| src/Timer.cc | |||
| src/World.cc | |||
| src/WorldPlane.cc) | |||
| target_include_directories(libswan PUBLIC "include/swan") | |||
| target_include_directories(libswan | |||
| PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/include" | |||
| PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include/swan") | |||
| set_target_properties(libswan PROPERTIES OUTPUT_NAME swan) | |||
| target_link_libraries(libswan ${libraries}) | |||
+ 3
- 0
libswan/include/swan/swan.h
View File
| @@ -6,7 +6,9 @@ | |||
| #include <swan/Chunk.h> | |||
| #include <swan/Entity.h> | |||
| #include <swan/Game.h> | |||
| #include <swan/Item.h> | |||
| #include <swan/Mod.h> | |||
| #include <swan/OS.h> | |||
| #include <swan/Resource.h> | |||
| #include <swan/SRF.h> | |||
| #include <swan/Tile.h> | |||
| @@ -17,3 +19,4 @@ | |||
| #include <swan/WorldGen.h> | |||
| #include <swan/WorldPlane.h> | |||
| #include <swan/common.h> | |||
| #include <swan/util.h> | |||
Loading…