From 7d0dcae00e4fb8bc042cf1efa544495143f9cc6e Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 3 Jun 2023 20:51:18 -0500 Subject: [PATCH] [nostalgia,turbine] Change NOSTALGIA_BUILD_TYPE to TURBINE_BUILD_TYPE --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- src/nostalgia/CMakeLists.txt | 2 +- src/nostalgia/appmodules/CMakeLists.txt | 4 ++-- src/nostalgia/core/CMakeLists.txt | 2 +- src/turbine/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4532f339..71151830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for if(BUILDCORE_TARGET STREQUAL "gba") set(NOSTALGIA_BUILD_STUDIO OFF) - set(NOSTALGIA_BUILD_TYPE "GBA") + set(TURBINE_BUILD_TYPE "GBA") include(deps/gbabuildcore/base.cmake) else() - set(NOSTALGIA_BUILD_TYPE "Native") + set(TURBINE_BUILD_TYPE "Native") set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b02e170..c4944697 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(".") -if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") +if(TURBINE_BUILD_TYPE STREQUAL "Native") add_subdirectory(glutils) add_subdirectory(studio) endif() diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt index 221b861a..6158554d 100644 --- a/src/nostalgia/CMakeLists.txt +++ b/src/nostalgia/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOSTALGIA_BUILD_PLAYER) add_subdirectory(player) endif() -if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") +if(TURBINE_BUILD_TYPE STREQUAL "Native") add_subdirectory(tools) if(NOSTALGIA_BUILD_STUDIO) add_subdirectory(studio) diff --git a/src/nostalgia/appmodules/CMakeLists.txt b/src/nostalgia/appmodules/CMakeLists.txt index d63c2ae2..0d3bb8db 100644 --- a/src/nostalgia/appmodules/CMakeLists.txt +++ b/src/nostalgia/appmodules/CMakeLists.txt @@ -18,7 +18,7 @@ install( include/nostalgia/appmodules ) -if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") +if(TURBINE_BUILD_TYPE STREQUAL "Native") add_library( NostalgiaStudioModules studiomodules.cpp @@ -32,4 +32,4 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") if(NOT MSVC) target_compile_options(NostalgiaStudioModules PRIVATE -Wsign-conversion) endif() -endif() \ No newline at end of file +endif() diff --git a/src/nostalgia/core/CMakeLists.txt b/src/nostalgia/core/CMakeLists.txt index eeeb7756..3f294879 100644 --- a/src/nostalgia/core/CMakeLists.txt +++ b/src/nostalgia/core/CMakeLists.txt @@ -6,7 +6,7 @@ add_library( typeconv.cpp ) -if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") +if(TURBINE_BUILD_TYPE STREQUAL "GBA") add_subdirectory(gba) else() add_subdirectory(opengl) diff --git a/src/turbine/CMakeLists.txt b/src/turbine/CMakeLists.txt index 2df5d051..698a2931 100644 --- a/src/turbine/CMakeLists.txt +++ b/src/turbine/CMakeLists.txt @@ -3,7 +3,7 @@ add_library( event.cpp ) -if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") +if(TURBINE_BUILD_TYPE STREQUAL "GBA") add_subdirectory(gba) else() add_subdirectory(glfw)