From 4ecb76b117ae135ea1487dc3cfd2a6898c8c2490 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 30 Apr 2024 01:19:02 -0400
Subject: tinyxml from package manager (#4073)

---
 .github/workflows/apt-deps.txt               |  2 +-
 .github/workflows/generate-builds.yml        | 29 ++++++++++++++++++++++++++++
 .github/workflows/macports-deps.txt          |  2 +-
 .github/workflows/test-builds-on-distros.yml |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt
index af6f8aabd..62eba0386 100644
--- a/.github/workflows/apt-deps.txt
+++ b/.github/workflows/apt-deps.txt
@@ -1 +1 @@
-libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev ninja-build 
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev ninja-build 
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
index 46e0abf53..5c1930ede 100644
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@@ -47,6 +47,20 @@ jobs:
         make -j 10
         sudo make install
         sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+    - name: Install latest tinyxml2
+      run: |
+        sudo apt-get remove libtinyxml2-dev
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "tinyxml2-10.0.0" ]; then
+          wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
+          tar -xzf 10.0.0.tar.gz
+        fi
+        cd tinyxml2-10.0.0
+        mkdir build
+        cd build
+        cmake ..
+        make
+        sudo make install
     - name: Generate soh.otr
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -205,6 +219,21 @@ jobs:
         cmake ..
         make
         sudo make install
+    - name: Install latest tinyxml2
+      if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
+      run: |
+        sudo apt-get remove libtinyxml2-dev
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "tinyxml2-10.0.0" ]; then
+          wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
+          tar -xzf 10.0.0.tar.gz
+        fi
+        cd tinyxml2-10.0.0
+        mkdir build
+        cd build
+        cmake ..
+        make
+        sudo make install
     - name: Install latest SDL_net
       if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
       run: |
diff --git a/.github/workflows/macports-deps.txt b/.github/workflows/macports-deps.txt
index 96bb9d40a..d15039078 100644
--- a/.github/workflows/macports-deps.txt
+++ b/.github/workflows/macports-deps.txt
@@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal
\ No newline at end of file
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal
\ No newline at end of file
diff --git a/.github/workflows/test-builds-on-distros.yml b/.github/workflows/test-builds-on-distros.yml
index 82709d1af..683e07b24 100644
--- a/.github/workflows/test-builds-on-distros.yml
+++ b/.github/workflows/test-builds-on-distros.yml
@@ -1,5 +1,6 @@
 # todo:
 # nlohmann
+# tinyxml2
 
 name: test-builds-on-distros
 on:
-- 
cgit v1.2.3