[olympic] Move keel, turbine, and studio to olympic

src/CMakeLists.txt

@@ -4,9 +4,6 @@ set(OLYMPIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/olympic")
 
 if(TURBINE_BUILD_TYPE STREQUAL "Native")
     add_subdirectory(glutils)
-    add_subdirectory(studio)
 endif()
-add_subdirectory(keel)
 add_subdirectory(nostalgia)
 add_subdirectory(olympic)
-add_subdirectory(turbine)

src/olympic/CMakeLists.txt

@@ -1 +1,6 @@
 add_subdirectory(applib)
+add_subdirectory(keel)
+add_subdirectory(turbine)
+if(TURBINE_BUILD_TYPE STREQUAL "Native")
+    add_subdirectory(studio)
+endif()

src/olympic/keel/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_subdirectory(src)
+
+if(TURBINE_BUILD_TYPE STREQUAL "Native")
+	add_subdirectory(test)
+endif()

src/olympic/keel/src/CMakeLists.txt

@@ -10,6 +10,11 @@ add_library(
 		typestore.cpp
 )
 
+target_include_directories(
+	Keel PUBLIC
+		../include
+)
+
 target_link_libraries(
 	Keel PUBLIC
 		OxClaw
@@ -20,16 +25,8 @@ target_link_libraries(
 )
 
 install(
-	FILES
+	DIRECTORY
-		asset.hpp
+		../include/keel
-		assetmanager.hpp
-		context.hpp
-		keel.hpp
-		media.hpp
-		module.hpp
-		pack.hpp
-		typeconv.hpp
-		typestore.hpp
 	DESTINATION
 		include/keel
 )
@@ -47,6 +44,10 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
 		KeelPack-AppLib
 			pack-applib.cpp
 	)
+	target_include_directories(
+		KeelPack-AppLib PUBLIC
+			../include
+	)
 	target_compile_definitions(
 		KeelPack-AppLib PUBLIC
 			OLYMPIC_LOAD_KEEL_MODULES=1
@@ -54,9 +55,9 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
 	)
 	target_link_libraries(
 		KeelPack-AppLib
+			Keel
 			OxClArgs
 			OxClaw
 			OxLogConn
 	)
-	add_subdirectory(test)
 endif()

src/olympic/keel/src/asset.cpp

@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "asset.hpp"
+#include <keel/asset.hpp>
 
 namespace keel {
 

src/olympic/keel/src/keel.cpp

@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "keel.hpp"
+#include <keel/keel.hpp>
 
 namespace keel {
 

src/olympic/keel/src/media.cpp

@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "media.hpp"
+#include <keel/media.hpp>
 
 #ifndef OX_BARE_METAL
 
@@ -116,7 +116,7 @@ ox::Error performPackTransforms(Context &ctx, ox::Buffer &clawData) noexcept {
 
 #else
 
-#include "context.hpp"
+#include <keel/context.hpp>
 
 #define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
 

src/olympic/keel/src/module.cpp

@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "module.hpp"
+#include <keel/module.hpp>
 
 namespace keel {
 

src/olympic/keel/src/pack.cpp

@@ -7,7 +7,7 @@
 
 #include <keel/media.hpp>
 
-#include "pack.hpp"
+#include <keel/pack.hpp>
 
 namespace keel {
 

src/olympic/keel/src/typeconv.cpp

@@ -4,8 +4,8 @@
 
 #include <ox/claw/read.hpp>
 
-#include "media.hpp"
+#include <keel/media.hpp>
-#include "typeconv.hpp"
+#include <keel/typeconv.hpp>
 
 namespace keel {
 

src/olympic/keel/src/typestore.cpp

@@ -2,7 +2,7 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include "typestore.hpp"
+#include <keel/typestore.hpp>
 
 namespace keel {