dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,953 Commits 1 Branch 0 Tags
40644f21d4d319950df340c236eca9d55b4da943
Commit Graph

6 Commits

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
 2023-11-17 19:20:35 +00:00
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.
 2023-07-07 21:21:43 +00:00
Loïc Guilloux
5f2246eabf Fix 021c45c: [CMake] detection and use of nlohmann-json for emscripten (#11113) 2023-07-06 11:49:06 +02:00
Patric Stout
021c45c4f6 Add: [CMake] JSON library (nlohmann) 2023-05-14 23:22:02 +02:00
rubidium42
44ca7d9377 Change: Use gender-neutral pronouns 2021-05-15 10:16:48 +02:00
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>
 2020-12-15 15:46:39 +01:00