From bc51deef41a445a0dfc16701267988f06a816136 Mon Sep 17 00:00:00 2001 From: 0scar Date: Tue, 6 Feb 2024 19:05:17 +0100 Subject: Fix-fix static compilation --- tools/cmake/DawAddState.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tools') 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}) -- cgit v1.3