link?

Author: briaguya-ai

src/CMakeLists.txt

@@ -457,9 +457,10 @@ endif()
 
 #=================== Linking ===================
 
+target_link_libraries(libultraship PUBLIC "$<LINK_LIBRARY:WHOLE_ARCHIVE,storm>")
 target_link_libraries(libultraship
     PRIVATE StrHash64
-    PUBLIC ZAPDUtils ImGui storm tinyxml2 nlohmann_json::nlohmann_json
+    PUBLIC ZAPDUtils ImGui tinyxml2 nlohmann_json::nlohmann_json
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")

src/resource/archive/OtrArchive.cpp

@@ -64,16 +64,6 @@ std::shared_ptr<ResourceInitData> OtrArchive::LoadFileMeta(uint64_t hash) {
     return nullptr;
 }
 
-// i think there's a way to get the SFileCreateArchive symbol to link
-// by using --whole-archive or something but i'm really lost trying to
-// figure that out. it isn't a problem when just building OTRExporter
-// for the ExtractAssets target in SoH (that works without this), but when
-// trying to build SoH itself this symbol is not found. this is a stupid
-// hack to get it to build.
-void OtrArchive::BlargBecauseLinker() {
-    SFileCreateArchive("", 0, 0, nullptr);
-}
-
 bool OtrArchive::LoadRaw() {
     const bool opened = SFileOpenArchive(GetPath().c_str(), 0, MPQ_OPEN_READ_ONLY, &mHandle);
     if (opened) {

src/resource/archive/OtrArchive.h

@@ -29,8 +29,6 @@ class OtrArchive : virtual public Archive {
     std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
     std::shared_ptr<File> LoadFileRaw(uint64_t hash);
 
-    void BlargBecauseLinker();
-
   protected:
     std::shared_ptr<ResourceInitData> LoadFileMeta(const std::string& filePath);
     std::shared_ptr<ResourceInitData> LoadFileMeta(uint64_t hash);