dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 021c45c: [CMake] detection and use of nlohmann-json for emscripten (#11113)

Browse Source
This commit is contained in:
Loïc Guilloux
2023-07-06 11:49:06 +02:00
committed by GitHub
parent 9f28da4e33
commit 5f2246eabf
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci-build.yml vendored
View File

@@ -32,10 +32,11 @@ jobs:
path: /emsdk/upstream/emscripten/cache
key: 3.1.37-${{ runner.os }}
- name: Patch Emscripten to support LZMA
- name: Patch Emscripten to support LZMA and nlohmann-json
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: |

3
.github/workflows/preview_build.yml vendored
View File

@@ -47,10 +47,11 @@ jobs:
path: /emsdk/upstream/emscripten/cache
key: 3.1.37-${{ runner.os }}
- name: Patch Emscripten to support LZMA
- name: Patch Emscripten to support LZMA and nlohmann_json
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: |