[nostalgia,turbine] Make GBA files (other than ARM asm) build on all platforms

CMakeLists.txt

@@ -45,10 +45,9 @@ add_subdirectory(deps/ox)
 include_directories(
 	deps/ox/src
 )
+add_subdirectory(deps/teagba)
 
-if(BUILDCORE_TARGET STREQUAL "gba")
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
-	add_subdirectory(deps/teagba)
-else()
 	include_directories(
 		SYSTEM
 			deps/glfw/deps

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

@@ -3,9 +3,8 @@ add_library(
 		gfx.cpp
 )
 
-if(TURBINE_BUILD_TYPE STREQUAL "GBA")
+add_subdirectory(gba)
-	add_subdirectory(gba)
+if(NOT TURBINE_BUILD_TYPE STREQUAL "GBA")
-else()
 	add_subdirectory(opengl)
 endif()
 

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

@@ -1,12 +1,20 @@
-enable_language(CXX ASM)
+add_library(
-set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
+	NostalgiaCore-GBA OBJECT
-target_sources(
-	NostalgiaCore PRIVATE
 		context.cpp
 		gfx.cpp
 		panic.cpp
 )
+target_include_directories(
+	NostalgiaCore-GBA PUBLIC
+		../../include
+)
 target_link_libraries(
-	NostalgiaCore PUBLIC
+	NostalgiaCore-GBA PUBLIC
 		TeaGBA
-)
+		Keel
+)
+
+if(TURBINE_BUILD_TYPE STREQUAL "GBA")
+	set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
+	target_link_libraries(NostalgiaCore PUBLIC NostalgiaCore-GBA)
+endif()

src/nostalgia/modules/core/src/gba/gfx.cpp

@@ -197,7 +197,7 @@ ox::Error loadSpritePalette(Context *ctx, unsigned cbb, const ox::FileAddress &p
 void puts(Context *ctx, int column, int row, ox::CRStringView str) noexcept {
 	const auto col = static_cast<unsigned>(column);
 	for (auto i = 0u; i < str.bytes(); i++) {
-		const auto c = charMap[static_cast<unsigned>(str[i])];
+		const auto c = charMap[static_cast<std::size_t>(str[i])];
 		setTile(ctx, 0, static_cast<int>(col + i), row, static_cast<uint8_t>(c));
 	}
 }

src/turbine/CMakeLists.txt

@@ -3,9 +3,8 @@ add_library(
 		event.cpp
 )
 
-if(TURBINE_BUILD_TYPE STREQUAL "GBA")
+add_subdirectory(gba)
-	add_subdirectory(gba)
+if(NOT TURBINE_BUILD_TYPE STREQUAL "GBA")
-else()
 	add_subdirectory(glfw)
 endif()
 

src/turbine/gba/CMakeLists.txt

@@ -1,16 +1,33 @@
-enable_language(CXX ASM)
+if(TURBINE_BUILD_TYPE STREQUAL "GBA")
-set_source_files_properties(turbine.arm.cpp irq.arm.cpp PROPERTIES COMPILE_FLAGS -marm)
+	enable_language(CXX ASM)
+endif()
+
+add_library(Turbine-GBA OBJECT)
 target_sources(
-	Turbine PRIVATE
+	Turbine-GBA PRIVATE
 		clipboard.cpp
 		gfx.cpp
 		irq.arm.cpp
-		irq.s
 		turbine.arm.cpp
 		turbine.cpp
 )
 
+if(TURBINE_BUILD_TYPE STREQUAL "GBA")
+	set_source_files_properties(turbine.arm.cpp irq.arm.cpp PROPERTIES COMPILE_FLAGS -marm)
+	target_sources(
+		Turbine-GBA PRIVATE
+			irq.s
+	)
+	target_link_libraries(Turbine PUBLIC Turbine-GBA)
+else()
+	target_sources(
+		Turbine-GBA PRIVATE
+			irqstub.cpp
+	)
+endif()
+
 target_link_libraries(
-	Turbine PUBLIC
+	Turbine-GBA PUBLIC
 		TeaGBA
+		Keel
 )

src/turbine/gba/irqstub.cpp

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+// stub for building TeaGBA for PC targets, for purposes of not having to
+// switch back and forth between builds when editing GBA files
+
+extern "C" void turbine_isr() {}

src/turbine/gba/turbine.cpp

@@ -36,6 +36,7 @@ static void initTimer() noexcept {
 	REG_IE = REG_IE | teagba::Int_timer0;
 }
 
+[[maybe_unused]]
 static ox::Result<std::size_t> findPreloadSection() noexcept {
 	// put the header in the wrong order to prevent mistaking this code for the
 	// media section
@@ -55,7 +56,9 @@ static ox::Result<std::size_t> findPreloadSection() noexcept {
 
 ox::Result<ox::UniquePtr<turbine::Context>> init(ox::UPtr<ox::FileSystem> fs, ox::CRStringView appName) noexcept {
 	oxRequireM(ctx, keel::init<gba::Context>(std::move(fs), appName));
+#ifdef OX_BARE_METAL
 	oxReturnError(findPreloadSection().moveTo(&ctx->preloadSectionOffset));
+#endif
 	oxReturnError(initGfx(*ctx));
 	initTimer();
 	initIrq();