diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 18:05:17 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 20:26:56 +0000 |
| commit | bc51deef41a445a0dfc16701267988f06a816136 (patch) | |
| tree | 518888d1c5416e432377238c95efe2c4d0813193 | |
| parent | 7ba1a5ce817e5f57862eccd63e2bfff906172d32 (diff) | |
Fix-fix static compilation
| -rw-r--r-- | tools/cmake/DawAddState.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/cmake/DawAddState.cmake b/tools/cmake/DawAddState.cmake index ae7c2fd..0a6c14e 100644 --- a/tools/cmake/DawAddState.cmake +++ b/tools/cmake/DawAddState.cmake @@ -50,7 +50,15 @@ macro(daw_add_state STATENAME) set_property(TARGET ${STATENAME} PROPERTY POSITION_INDEPENDENT_CODE ON) else() - add_library(${STATENAME} STATIC ${STATE_SOURCES}) + add_library(${STATENAME} OBJECT ${STATE_SOURCES}) + + # The game-state source is withing the core module + set_property(TARGET daw_core + APPEND PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_SOURCE_DIR}/state_${STATENAME}/include) + set_property(TARGET daw_core + APPEND PROPERTY LINK_LIBRARIES + ${STATENAME}) endif() target_include_directories(${STATENAME} PUBLIC @@ -60,7 +68,7 @@ macro(daw_add_state STATENAME) include ) - if(NOT DAW_BUILD_HOTRELOAD) + if(NOT (DAW_BUILD_HOTRELOAD OR BUILD_SHARED_LIBS)) set_property(TARGET daw APPEND PROPERTY LINK_LIBRARIES ${STATENAME}) |