[nostalgia,olympic] Cleanup CMake

src/nostalgia/CMakeLists.txt

@@ -1,6 +1,15 @@
 
+project(nostalgia CXX)
+
 #project packages
 
+set(NOSTALGIA_BUILD_PLAYER ON CACHE BOOL "Build Player")
+set(NOSTALGIA_BUILD_STUDIO ON CACHE BOOL "Build Studio")
+
+if(BUILDCORE_TARGET STREQUAL "gba")
+	set(NOSTALGIA_BUILD_STUDIO OFF)
+endif()
+
 if(APPLE)
 	set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
 	set(NOSTALGIA_DIST_BIN              NostalgiaStudio.app/Contents/MacOS)
@@ -17,13 +26,13 @@ endif()
 
 add_subdirectory(modules)
 
-if(NOSTALGIA_BUILD_PLAYER)
+if(${NOSTALGIA_BUILD_PLAYER})
 	add_subdirectory(player)
 endif()
 
-if(TURBINE_BUILD_TYPE STREQUAL "Native")
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(tools)
-	if(NOSTALGIA_BUILD_STUDIO)
+	if(${NOSTALGIA_BUILD_STUDIO})
 		add_subdirectory(studio)
 	endif()
 endif()

src/nostalgia/modules/CMakeLists.txt

@@ -23,26 +23,24 @@ install(
 		include/nostalgia/modules
 )
 
-if(${OLYMPIC_BUILD_STUDIO})
-	# Studio
-	if(TURBINE_BUILD_TYPE STREQUAL "Native")
-		add_library(
-			NostalgiaStudioModules STATIC
-				studiomodules.cpp
-		)
-		target_link_libraries(
-			NostalgiaStudioModules PUBLIC
-				StudioAppLib
-				NostalgiaCore-Studio-ImGui
-				NostalgiaScene-Studio
-		)
-		install(
-			FILES
-				studiomodules.hpp
-			DESTINATION
-				include/nostalgia/modules
-		)
-	endif()
+# Studio
+if(NOSTALGIA_BUILD_STUDIO)
+	add_library(
+		NostalgiaStudioModules STATIC
+			studiomodules.cpp
+	)
+	target_link_libraries(
+		NostalgiaStudioModules PUBLIC
+			StudioAppLib
+			NostalgiaCore-Studio-ImGui
+			NostalgiaScene-Studio
+	)
+	install(
+		 FILES
+			studiomodules.hpp
+		 DESTINATION
+			include/nostalgia/modules
+	)
 endif()
 
 add_library(NostalgiaProfile INTERFACE)

src/nostalgia/modules/core/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_subdirectory(src)
-if(NOT TURBINE_BUILD_TYPE STREQUAL "GBA")
+
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(test)
 endif()
 

src/nostalgia/modules/core/src/CMakeLists.txt

@@ -5,7 +5,7 @@ add_library(
 )
 
 add_subdirectory(gba)
-if(NOT TURBINE_BUILD_TYPE STREQUAL "GBA")
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(opengl)
 endif()
 

src/nostalgia/modules/core/src/gba/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(
 		Turbine
 )
 
-if(TURBINE_BUILD_TYPE STREQUAL "GBA")
+if(BUILDCORE_TARGET STREQUAL "gba")
 	set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
 	target_link_libraries(NostalgiaCore PUBLIC NostalgiaCore-GBA)
 endif()

src/nostalgia/modules/studiomodules.cpp

@@ -2,8 +2,6 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <keel/module.hpp>
-
 #include <studioapp/studioapp.hpp>
 
 #include <nostalgia/core/studiomodule.hpp>