Merge branch 'HarbourMasters:develop' into ShortMsg

PurpleHato · Oct 17, 2023 · 0469d4a · 0469d4a
2 parents 16420bf + cff2e37
commit 0469d4a
Show file tree

Hide file tree

Showing 415 changed files with 567 additions and 62,004 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "libultraship"]
 	path = libultraship
 	url = https://github.com/kenix3/libultraship.git
+[submodule "ZAPDTR"]
+	path = ZAPDTR
+	url = https://github.com/harbourmasters/ZAPDTR
+[submodule "OTRExporter"]
+	path = OTRExporter
+	url = https://github.com/harbourmasters/OTRExporter
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,6 +108,15 @@ install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DEST
 install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor)
 endif()
 
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT ship)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls COMPONENT ship)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
+endif()
+
 find_package(Python3 COMPONENTS Interpreter)
 
 # Target to generate OTRs

diff --git a/OTRExporter b/OTRExporter
diff --git a/OTRExporter/.gitignore b/OTRExporter/.gitignore
diff --git a/OTRExporter/.gitrepo b/OTRExporter/.gitrepo