Merge pull request #23 from Archez/merge-soh-macready

louist103 · May 3, 2024 · 55eb1c4 · 55eb1c4
2 parents 031782d + fb824a9
commit 55eb1c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,8 +88,4 @@ if (NOT TARGET ZAPD)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
 endif()
 
-if (NOT TARGET ZAPDUtils)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
-endif()
-
 add_subdirectory(OTRExporter)
diff --git a/OTRExporter/CMakeLists.txt b/OTRExporter/CMakeLists.txt
@@ -165,11 +165,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/Mercury
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/tinyxml2
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
-	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/StormLib/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
     ${CMAKE_CURRENT_SOURCE_DIR}/../../mm/2s2h
 	.
@@ -178,6 +173,17 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 find_package(nlohmann_json REQUIRED)
 target_link_libraries(${PROJECT_NAME} PUBLIC nlohmann_json::nlohmann_json)
 
+find_package(spdlog REQUIRED)
+target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)
+
+FetchContent_Declare(
+    StormLib
+    GIT_REPOSITORY https://github.com/ladislav-zezula/StormLib.git
+    GIT_TAG v9.25
+)
+FetchContent_MakeAvailable(StormLib)
+target_include_directories(${PROJECT_NAME} PRIVATE ${stormlib_SOURCE_DIR}/src)
+
 if(MSVC)
     if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
         target_compile_options(${PROJECT_NAME} PRIVATE
@@ -254,4 +260,3 @@ add_dependencies(${PROJECT_NAME}
 
 # Link with other targets.
 target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
-
diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp
@@ -3,7 +3,7 @@
 #include "../ZAPD/ZFile.h"
 #include <Utils/MemoryStream.h>
 #include <Utils/BitConverter.h>
-#include "StrHash64/StrHash64.h"
+#include <utils/StrHash64.h>
 #include "spdlog/spdlog.h"
 #include <libultraship/libultra/gbi.h>
 #include <Globals.h>

diff --git a/OTRExporter/ExporterArchive.cpp b/OTRExporter/ExporterArchive.cpp
@@ -1,6 +1,6 @@
 #include "ExporterArchive.h"
 #include "Utils/StringHelper.h"
-#include <StrHash64/StrHash64.h>
+#include <utils/StrHash64.h>
 #include <filesystem>
 
 ExporterArchive::ExporterArchive(const std::string& path, bool enableWriting) : mPath(path) {