From a4fb67745a187e564b215f2ed98c85bdfeb3d78f Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:55:16 -0400
Subject: [PATCH] nlohmann from package managers (#4071)

---
 .github/workflows/apt-deps.txt               |  2 +-
 .github/workflows/generate-builds.yml        | 37 ++++++++++++++++++++
 .github/workflows/macports-deps.txt          |  2 +-
 .github/workflows/test-builds-on-distros.yml |  3 ++
 CMakeLists.txt                               |  2 +-
 OTRExporter                                  |  2 +-
 libultraship                                 |  2 +-
 7 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt
index e9f7e07e1..af6f8aabd 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 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 ninja-build 
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
index 96ae2f270..4b8153a07 100644
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@@ -190,6 +190,21 @@ jobs:
         cmake ..
         make
         sudo make install
+    - name: Install latest nlohmann
+      if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) }}
+      run: |
+        sudo apt-get remove nlohmann-json3-dev
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "json-3.11.3" ]; then
+          wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz
+          tar -xzvf v3.11.3.tar.gz
+        fi
+        cd json-3.11.3
+        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: |
@@ -247,6 +262,17 @@ jobs:
         cmake -H.. -B. -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
         make
         make install
+        cd ../..
+        wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz
+        tar -xzvf v3.11.3.tar.gz
+        cd json-3.11.3
+        mkdir build
+        cd build
+        cmake -H.. -B. -DJSON_BuildTests=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+        make
+        make install
+        cd ../..
+
     - name: Fix dubious ownership error
       if: ${{ vars.LINUX_RUNNER }}
       run: git config --global --add safe.directory '*'
@@ -300,6 +326,17 @@ jobs:
         cmake -H.. -B. -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake
         make
         make install
+        cd ../..
+        wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz
+        tar -xzvf v3.11.3.tar.gz
+        cd json-3.11.3
+        mkdir build
+        cd build
+        cmake -H.. -B. -DJSON_BuildTests=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake
+        make
+        make install
+        cd ../..
+
     - uses: actions/checkout@v3
       with:
         submodules: true
diff --git a/.github/workflows/macports-deps.txt b/.github/workflows/macports-deps.txt
index 084428d16..96bb9d40a 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
\ No newline at end of file
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +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 190599a44..82709d1af 100644
--- a/.github/workflows/test-builds-on-distros.yml
+++ b/.github/workflows/test-builds-on-distros.yml
@@ -1,3 +1,6 @@
+# todo:
+# nlohmann
+
 name: test-builds-on-distros
 on:
   workflow_dispatch:    # by request
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5227169d..386142065 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(VCPKG_TARGET_TRIPLET x64-windows-static)
 
     vcpkg_bootstrap()
-    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3)
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json)
 
     if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
         set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
diff --git a/OTRExporter b/OTRExporter
index e93bd2be0..467434c56 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit e93bd2be062b13106fdb29d98cf4ada4d7ad6827
+Subproject commit 467434c5666e11a3a7b756ff04401cd54da5c3f2
diff --git a/libultraship b/libultraship
index 81f04fdce..85f6de497 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 81f04fdcedeb5186b56b105fb0cc5cb0a478ae90
+Subproject commit 85f6de497f6d375390cc3b4ba55eae5ef9c1b153