From a1de7fbd8a44a1a59cc36d1da6abe58aa8682dfa Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Tue, 12 Dec 2023 20:13:07 -0600
Subject: [PATCH] [olympic,nostalgia] Make Applib an interface library that
 publicly exports applib.cpp

---
 src/CMakeLists.txt                      | 2 --
 src/nostalgia/modules/studiomodules.cpp | 2 +-
 src/nostalgia/studio/CMakeLists.txt     | 6 ++----
 src/nostalgia/tools/CMakeLists.txt      | 6 ++----
 src/olympic/applib/CMakeLists.txt       | 9 +++++++++
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a1eb9e6..a1879136 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 include_directories(".")
 
-set(OLYMPIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/olympic")
-
 add_subdirectory(nostalgia)
 add_subdirectory(olympic)
diff --git a/src/nostalgia/modules/studiomodules.cpp b/src/nostalgia/modules/studiomodules.cpp
index 2a76f4b1..546ddf8f 100644
--- a/src/nostalgia/modules/studiomodules.cpp
+++ b/src/nostalgia/modules/studiomodules.cpp
@@ -18,7 +18,7 @@ void registerStudioModules() noexcept {
 	}
 	modulesRegistered = true;
 	studio::registerModule(core::studioModule());
-	studio::registerModule(scene::studioModule());
+	//studio::registerModule(scene::studioModule());
 }
 
 }
diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt
index 1d0374c6..0ed4cc9a 100644
--- a/src/nostalgia/studio/CMakeLists.txt
+++ b/src/nostalgia/studio/CMakeLists.txt
@@ -1,7 +1,4 @@
-add_executable(
-	nostalgia-studio WIN32 MACOSX_BUNDLE
-		${OLYMPIC_PATH}/applib/applib.cpp
-)
+add_executable(nostalgia-studio WIN32 MACOSX_BUNDLE)
 
 target_link_libraries(
 	nostalgia-studio
@@ -9,6 +6,7 @@ target_link_libraries(
 		NostalgiaStudioModules
 		NostalgiaKeelModules
 		StudioAppLib
+		OlympicApplib
 )
 
 install(
diff --git a/src/nostalgia/tools/CMakeLists.txt b/src/nostalgia/tools/CMakeLists.txt
index d13dff20..d14b7c05 100644
--- a/src/nostalgia/tools/CMakeLists.txt
+++ b/src/nostalgia/tools/CMakeLists.txt
@@ -1,13 +1,11 @@
-add_executable(
-	nostalgia-pack
-		${OLYMPIC_PATH}/applib/applib.cpp
-)
+add_executable(nostalgia-pack)
 
 target_link_libraries(
 	nostalgia-pack
 		KeelPack-AppLib
 		NostalgiaKeelModules
 		NostalgiaProfile
+		OlympicApplib
 )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32)
diff --git a/src/olympic/applib/CMakeLists.txt b/src/olympic/applib/CMakeLists.txt
index e69de29b..0b20b16a 100644
--- a/src/olympic/applib/CMakeLists.txt
+++ b/src/olympic/applib/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+add_library(
+    OlympicApplib INTERFACE
+)
+
+target_sources(
+    OlympicApplib INTERFACE
+        applib.cpp
+)
\ No newline at end of file