switch to exclude and ifndef because of how compiler defines are propogated in cmake

it's probably possible to get this working with some intense cmake digging on the port side but i don't see a clear path forward with that at the moment

Author: briaguya-ai

.github/workflows/build-validation.yml

@@ -104,6 +104,55 @@ jobs:
         name: soh-linux
         path: build-cmake/src/*.a
         if-no-files-found: error
+  build-linux-no-mpq:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
+    - name: ccache
+      uses: hendrikmuhs/[email protected]
+      with:
+        key: ${{ matrix.os }}-ccache-${{ github.ref }}-${{ github.sha }}
+        restore-keys: |
+          ${{ matrix.os }}-ccache-${{ github.ref }}
+          ${{ matrix.os }}-ccache-
+    - name: Install latest SDL
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        wget https://www.libsdl.org/release/SDL2-2.24.1.tar.gz
+        tar -xzf SDL2-2.24.1.tar.gz
+        cd SDL2-2.24.1
+        ./configure
+        make -j 10
+        sudo make install
+    - name: Install latest tinyxml2
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
+        tar -xzf 10.0.0.tar.gz
+        cd tinyxml2-10.0.0
+        mkdir build
+        cd build
+        cmake ..
+        make
+        sudo make install
+    - name: Build libultraship
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DEXCLUDE_MPQ_SUPPORT=TRUE
+        cmake --build build-cmake --config Release --parallel 10
+      env:
+        CC: gcc-10
+        CXX: g++-10
+    - name: Upload build
+      uses: actions/upload-artifact@v3
+      with:
+        name: soh-linux
+        path: build-cmake/src/*.a
+        if-no-files-found: error
   build-windows:
     runs-on: windows-latest
     steps:

CMakeLists.txt

@@ -24,9 +24,9 @@ include(cmake/Utils.cmake)
 set(ADDITIONAL_LIB_INCLUDES "")
 
 # ========= Configuration Options =========
-set(MPQ_SUPPORT TRUE CACHE BOOL "Include StormLib and support using MPQ archives")
-if(MPQ_SUPPORT)
-    add_compile_definitions(MPQ_SUPPORT)
+set(EXCLUDE_MPQ_SUPPORT FALSE CACHE BOOL "Exclude StormLib and MPQ archive support")
+if(EXCLUDE_MPQ_SUPPORT)
+    add_compile_definitions(EXCLUDE_MPQ_SUPPORT)
 endif()
 
 # =========== Dependencies =============

cmake/dependencies/common.cmake

@@ -32,7 +32,7 @@ target_sources(ImGui
 target_include_directories(ImGui PUBLIC ${imgui_SOURCE_DIR} ${imgui_SOURCE_DIR}/backends PRIVATE ${SDL2_INCLUDE_DIRS})
 
 # ========= StormLib =============
-if(MPQ_SUPPORT)
+if(NOT EXCLUDE_MPQ_SUPPORT)
     FetchContent_Declare(
         StormLib
         GIT_REPOSITORY https://github.com/ladislav-zezula/StormLib.git

src/resource/archive/ArchiveManager.cpp

@@ -4,7 +4,7 @@
 #include "spdlog/spdlog.h"
 
 #include "resource/archive/Archive.h"
-#ifdef MPQ_SUPPORT
+#ifndef EXCLUDE_MPQ_SUPPORT
 #include "resource/archive/OtrArchive.h"
 #endif
 #include "resource/archive/O2rArchive.h"
@@ -153,7 +153,7 @@ std::shared_ptr<Archive> ArchiveManager::AddArchive(const std::string& archivePa
 
     if (StringHelper::IEquals(extension, ".zip") || StringHelper::IEquals(extension, ".zip")) {
         archive = dynamic_pointer_cast<Archive>(std::make_shared<O2rArchive>(archivePath));
-#ifdef MPQ_SUPPORT
+#ifndef EXCLUDE_MPQ_SUPPORT
     } else if (StringHelper::IEquals(extension, ".otr") || StringHelper::IEquals(extension, ".mpq")) {
         archive = dynamic_pointer_cast<Archive>(std::make_shared<OtrArchive>(archivePath));
 #endif

src/resource/archive/OtrArchive.cpp

@@ -1,4 +1,4 @@
-#ifdef MPQ_SUPPORT
+#ifndef EXCLUDE_MPQ_SUPPORT
 
 #include "OtrArchive.h"
 
@@ -103,4 +103,4 @@ bool OtrArchive::Close() {
 
 } // namespace Ship
 
-#endif // MPQ_SUPPORT
+#endif // EXCLUDE_MPQ_SUPPORT

src/resource/archive/OtrArchive.h

@@ -1,6 +1,6 @@
-#pragma once
+#ifndef EXCLUDE_MPQ_SUPPORT
 
-#ifdef MPQ_SUPPORT
+#pragma once
 
 #undef _DLL
 
@@ -38,4 +38,4 @@ class OtrArchive : virtual public Archive {
 };
 } // namespace Ship
 
-#endif // MPQ_SUPPORT
+#endif // EXCLUDE_MPQ_SUPPORT