Commit Graph

6 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison cf4cf5c08f 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
7 months ago
Patric Stout 153323a4c0
Fix: [Emscripten] actually link against nlohmann_json (#11120)
We fake a plain (non-scoped) library, but we don't actually set
the library to anything valid. In result, it is never actually
linked.
11 months ago
Loïc Guilloux 5f2246eabf
Fix 021c45c: [CMake] detection and use of nlohmann-json for emscripten (#11113) 11 months ago
Patric Stout 021c45c4f6 Add: [CMake] JSON library (nlohmann) 1 year ago
rubidium42 44ca7d9377 Change: Use gender-neutral pronouns 3 years ago
Patric Stout d15dc9f40f Add: support for emscripten (play-OpenTTD-in-the-browser)
Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.

Co-authored-by: milek7 <me@milek7.pl>
4 years ago