summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author0undefined <oscar@nelin.dk>2025-02-26 14:25:33 +0000
committeronelin <oscar@nelin.dk>2025-02-26 14:58:26 +0000
commit52b7dff22267ae9e6777b7f5243b871275765298 (patch)
treeebcfc100c28832a65cd7271853f73239db244a6a
parent1b4faea25611bc4be8ca92e42b500a1d25319300 (diff)
Fix static builds
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--tools/cmake/DawAddState.cmake12
2 files changed, 12 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 14d5307..8b9cc1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,10 +27,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
target_include_directories(${PROJECT_NAME} PUBLIC
include
- # TODO make including stb more streamlined
- ${CMAKE_BINARY_DIR}/_deps/cgs-src/src
+ # TODO include stb (??)
${CMAKE_BINARY_DIR}/include
- ${ENGINE_INCLUDE})
+ )
target_link_libraries(${PROJECT_NAME}
glfw
diff --git a/tools/cmake/DawAddState.cmake b/tools/cmake/DawAddState.cmake
index 1a0ebef..213b77b 100644
--- a/tools/cmake/DawAddState.cmake
+++ b/tools/cmake/DawAddState.cmake
@@ -56,10 +56,18 @@ macro(daw_add_state STATENAME)
# The game-state source is withing the core module
set_property(TARGET daw_core
APPEND PROPERTY INCLUDE_DIRECTORIES
- ${CMAKE_SOURCE_DIR}/state_${STATENAME}/include)
+ ${CMAKE_SOURCE_DIR}/state_${STATENAME}/include
+ )
+
+ set_property(TARGET ${STATENAME}
+ APPEND PROPERTY LINK_LIBRARIES
+ cglm
+ )
+
set_property(TARGET daw_core
APPEND PROPERTY LINK_LIBRARIES
${STATENAME})
+
set_property(TARGET daw
APPEND PROPERTY LINK_LIBRARIES
${STATENAME})
@@ -70,7 +78,7 @@ macro(daw_add_state STATENAME)
${CMAKE_BINARY_DIR}/include
${DAW_INCLUDE_DIRS}
include
- )
+ )
list(APPEND STATE_LIST ${STATENAME})
endmacro()