diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 17:12:31 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 17:45:12 +0000 |
| commit | 239a7ade7304ea8a1262d1f3853f6dfc671fb5b4 (patch) | |
| tree | a4a0e7946cea7a8effd446c3340e671854850a54 | |
| parent | d2978c6a589556bd43b60ff63f01a8d22fba8821 (diff) | |
Fix static compilation
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/cmake/DawAddState.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c091d8..a152839 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ cmake_dependent_option(DAW_BUILD_DEBUG cmake_dependent_option(DAW_BUILD_HOTRELOAD "Compile daw engine with hot reloading enabled" ON - "NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;CMAKE_BUILD_TYPE STREQUAL Debug;NOT WIN32;BUILD_SHARED_LIBS" OFF) + "NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;CMAKE_BUILD_TYPE STREQUAL Debug;NOT WIN32" OFF) cmake_dependent_option(DAW_BUILD_ASAN "Compile daw engine with address sanitizer (asan)" ON diff --git a/tools/cmake/DawAddState.cmake b/tools/cmake/DawAddState.cmake index c6bedcd..ae7c2fd 100644 --- a/tools/cmake/DawAddState.cmake +++ b/tools/cmake/DawAddState.cmake @@ -40,7 +40,7 @@ macro(daw_add_state STATENAME) # TODO: When state reloading is implemented properly, add MODULE library # option. In general, this should only be available when debugging. - if(BUILD_SHARED_LIBS) + if(BUILD_SHARED_LIBS OR DAW_BUILD_HOTRELOAD) if(DAW_BUILD_HOTRELOAD) add_library(${STATENAME} MODULE ${STATE_SOURCES}) else() @@ -50,7 +50,7 @@ macro(daw_add_state STATENAME) set_property(TARGET ${STATENAME} PROPERTY POSITION_INDEPENDENT_CODE ON) else() - add_library(${STATENAME} OBJECT ${STATE_SOURCES}) + add_library(${STATENAME} STATIC ${STATE_SOURCES}) endif() target_include_directories(${STATENAME} PUBLIC |