From 2036ec55cb40bb5067eacd40d7e137142cb80a30 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 23 Dec 2023 15:31:11 -0600 Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 5b167fd5..c90a8449 c90a8449 [olympic/turbine] Fix some broken CMake vars 95dcd6be [teagba] Fix not to rely on TURBINE_BUILD_TYPE git-subtree-dir: deps/nostalgia git-subtree-split: c90a8449be5f49268748a7ae7ebfa86c83d51001 --- deps/teagba/src/CMakeLists.txt | 2 +- src/olympic/turbine/src/CMakeLists.txt | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/deps/teagba/src/CMakeLists.txt b/deps/teagba/src/CMakeLists.txt index 0069dd2..aebf4c7 100644 --- a/deps/teagba/src/CMakeLists.txt +++ b/deps/teagba/src/CMakeLists.txt @@ -6,7 +6,7 @@ add_library( gfx.cpp ) -if(TURBINE_BUILD_TYPE STREQUAL "GBA") +if(BUILDCORE_TARGET STREQUAL "gba") set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm) target_sources( TeaGBA PRIVATE diff --git a/src/olympic/turbine/src/CMakeLists.txt b/src/olympic/turbine/src/CMakeLists.txt index 1e9a57c..1e647f7 100644 --- a/src/olympic/turbine/src/CMakeLists.txt +++ b/src/olympic/turbine/src/CMakeLists.txt @@ -1,10 +1,15 @@ add_library(Turbine) -set(TURBINE_BACKEND_GBA ${TURBINE_BUILD_TYPE} STREQUAL "GBA") -set(TURBINE_BACKEND_GLFW NOT ${TURBINE_BACKEND_GBA}) +if(TURBINE_BUILD_TYPE STREQUAL "GBA") + set(TURBINE_BACKEND_GBA TRUE) + set(TURBINE_BACKEND_GLFW FALSE) +else() + set(TURBINE_BACKEND_GBA FALSE) + set(TURBINE_BACKEND_GLFW TRUE) +endif() add_subdirectory(gba) -if(${TURBINE_BACKEND_GLFW}) +if(TURBINE_BACKEND_GLFW) add_subdirectory(glfw) endif()