Add spiritless_po as submodules.

.github/workflows/macos.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'resinstaller/src/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/macos.yml'
       - 'CMakeLists.txt'
@@ -15,6 +16,7 @@ on:
     paths:
       - 'resinstaller/src/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/macos.yml'
       - 'CMakeLists.txt'
@@ -27,6 +29,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: install dependencies
       run: brew install sdl2 sdl2_mixer sdl2_net libogg libvorbis

.github/workflows/premake5-windows.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'resinstaller/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/premake5-windows.yml'
       - 'premake5.lua'
@@ -14,6 +15,7 @@ on:
     paths:
       - 'resinstaller/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/premake5-windows.yml'
       - 'premake5.lua'
@@ -25,6 +27,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: checkout premake5
       uses: actions/checkout@v4

.github/workflows/release-windows.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: checkout premake5
       uses: actions/checkout@v4

.github/workflows/ubuntu.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'resinstaller/src/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/ubuntu.yml'
       - 'CMakeLists.txt'
@@ -15,6 +16,7 @@ on:
     paths:
       - 'resinstaller/src/**'
       - 'src/**'
+      - 'submodules/**'
       - 'test/**'
       - '.github/workflows/ubuntu.yml'
       - 'CMakeLists.txt'
@@ -27,6 +29,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: apt-get update
       run: sudo apt-get update

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/spiritless_po"]
+	path = submodules/spiritless_po
+	url = https://github.com/oo13/spiritless_po.git

CMakeLists.txt

@@ -123,7 +123,7 @@ add_executable(maxr_dedicatedserver ${maxr_dedicatedserver_SRCS} ${RESOURCE_FILE
 add_executable(maxr ${maxr_SRCS} ${RESOURCE_FILE})
 add_executable(maxr_tests ${maxr_tests_SRCS})
 
-target_include_directories(maxr_lib SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/3rd/spiritless_po/include")
+target_include_directories(maxr_lib SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/spiritless_po/include")
 
 target_link_libraries(resinstaller SDL_flic)
 target_link_libraries(maxr maxr_lib SDL_flic mve_player)

premake5.lua

@@ -206,7 +206,7 @@ project "maxr_lib"
 
 	files { "src/lib/**.cpp", "src/lib/**.h", "src/**.in", "src/.clang-format", "CMakeList.txt" }
 	includedirs { "src", "src/lib" }
-	externalincludedirs { "src/3rd/spiritless_po/include" }
+	externalincludedirs { "submodules/spiritless_po/include" }
 
 if _OPTIONS["crashRpt_root"] ~= nil then
 	externalincludedirs { path.join(_OPTIONS["crashRpt_root"], "include") }
@@ -254,8 +254,8 @@ project "nlohmann" -- header only
 project "spiritless_po" -- header only
 	kind "None"
 
-	files { "src/3rd/spiritless_po/**.*" }
-	vpaths { ["spiritless_po/*"] = "src/3rd/spiritless_po" }
+	files { "submodules/spiritless_po/**.*" }
+	vpaths { ["spiritless_po/*"] = "submodules/spiritless_po" }
 
 group ""
 project "data" -- data