Codechange: vendor the nlohmann-json library (#11290)

(cherry picked from commit ba67f39db6)

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/os/macosx/survey_osx.cpp
#	src/os/windows/survey_win.cpp
#	src/script/api/script_admin.cpp
#	src/script/api/script_event_types.cpp
#	src/tests/test_script_admin.cpp
This commit is contained in:
Jonathan G Rennison
2023-11-17 19:20:35 +00:00
parent af1150182a
commit cf4cf5c08f
20 changed files with 24631 additions and 141 deletions

View File

@@ -44,11 +44,10 @@ jobs:
path: /emsdk/upstream/emscripten/cache
key: 3.1.42-${{ runner.os }}
- name: Patch Emscripten to support LZMA and nlohmann-json
- name: Patch Emscripten to support LZMA
run: |
cd /emsdk/upstream/emscripten
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
- name: Build (host tools)
run: |
@@ -139,7 +138,6 @@ jobs:
liblzma-dev \
libzstd-dev \
liblzo2-dev \
nlohmann-json3-dev \
${{ matrix.libraries }} \
zlib1g-dev \
# EOF
@@ -238,7 +236,6 @@ jobs:
liblzma \
libpng \
lzo \
nlohmann-json \
zlib \
zstd \
# EOF
@@ -330,7 +327,6 @@ jobs:
liblzma \
libpng \
lzo \
nlohmann-json \
zlib \
zstd \
# EOF
@@ -421,7 +417,6 @@ jobs:
mingw-w64-${{ matrix.arch }}-gcc
mingw-w64-${{ matrix.arch }}-lzo2
mingw-w64-${{ matrix.arch }}-libpng
mingw-w64-${{ matrix.arch }}-nlohmann-json
- name: Install OpenGFX
shell: bash

View File

@@ -40,11 +40,10 @@ jobs:
path: /emsdk/upstream/emscripten/cache
key: 3.1.42-${{ runner.os }}
- name: Patch Emscripten to support LZMA and nlohmann_json
- name: Patch Emscripten to support LZMA
run: |
cd /emsdk/upstream/emscripten
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
- name: Build (host tools)
run: |

View File

@@ -116,7 +116,6 @@ jobs:
liblzma \
libpng \
lzo \
nlohmann-json \
sdl2 \
zlib \
zstd \

View File

@@ -61,8 +61,6 @@ jobs:
libpng:arm64-osx \
lzo:x64-osx \
lzo:arm64-osx \
nlohmann-json:x64-osx \
nlohmann-json:arm64-osx \
zlib:x64-osx \
zlib:arm64-osx \
zstd:x64-osx \

View File

@@ -68,7 +68,6 @@ jobs:
liblzma \
libpng \
lzo \
nlohmann-json \
zlib \
zstd \
# EOF