diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 16:24:59 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 16:37:29 +0000 |
| commit | 1c4b303621b08e8e0e43a5412ff0a1b4cd8d2ae1 (patch) | |
| tree | 3c4f3eb3014b5d40dbd221bc21202f05621132fa | |
| parent | d96f7015eefae59e37e11fe21aed22df1d71c96c (diff) | |
Fix hot reloading
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/cmake/DawAddState.cmake | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e50608a..6c091d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,12 @@ set(ENGINE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(ENGINE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(ENGINE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(ENGINE_VERSION_TWEAK ${GIT_SHA}) -string(TOLOWER "${CMAKE_BUILD_TYPE}" ENGINE_BUILD_TYPE) + +if("${CMAKE_BUILD_TYPE}" STREQUAL "") + set(ENGINE_BUILD_TYPE "default") +else() + string(TOLOWER "${CMAKE_BUILD_TYPE}" ENGINE_BUILD_TYPE) +endif() ## Packages set(GLFW_USE_WAYLAND ON) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c75cdf6..82ccfdd 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -14,3 +14,7 @@ set_property(SOURCE src/loop.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER}) target_include_directories(daw_core PRIVATE ${DAW_INCLUDE_DIRS}) target_link_libraries(daw_core PRIVATE cglm) + +target_compile_definitions(daw_core PUBLIC + $<$<BOOL:${DAW_BUILD_HOTRELOAD}>:DAW_BUILD_HOTRELOAD> +) diff --git a/tools/cmake/DawAddState.cmake b/tools/cmake/DawAddState.cmake index 394d6c6..c6bedcd 100644 --- a/tools/cmake/DawAddState.cmake +++ b/tools/cmake/DawAddState.cmake @@ -41,11 +41,8 @@ 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(DAW_BUILD_DEBUG AND DAW_BUILD_HOTRELOAD) + if(DAW_BUILD_HOTRELOAD) add_library(${STATENAME} MODULE ${STATE_SOURCES}) - target_compile_definitions(${STATENAME} PUBLIC - $<$<BOOL:${DAW_BUILD_DEBUG}>:_DEBUG> - ) else() add_library(${STATENAME} SHARED ${STATE_SOURCES}) endif() |