mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Require the correct minimum version of nlohmann json

Browse source
This commit is contained in:
Enriath 2024-11-24 19:09:48 +00:00 committed by GitHub
parent d94d92e197
commit d5b769bcc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -4,7 +4,7 @@ Section: misc
Priority: optional Priority: optional
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Multi-Arch: same Multi-Arch: same
Build-Depends: debhelper (>= 9), cmake (>= 3.8), libsdl2-dev, g++ (>= 4:10), pkg-config, nlohmann-json3-dev (>= 3.6.0), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev, libzip-dev (>= 1.0.0), libicu-dev (>= 59.0), libflac-dev, libvorbis-dev Build-Depends: debhelper (>= 9), cmake (>= 3.8), libsdl2-dev, g++ (>= 4:10), pkg-config, nlohmann-json3-dev (>= 3.9.0), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev, libzip-dev (>= 1.0.0), libicu-dev (>= 59.0), libflac-dev, libvorbis-dev
Package: openrct2 Package: openrct2
Architecture: any Architecture: any

2
readme.md
View file

@ -128,7 +128,7 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo
- libpng (>= 1.2) - libpng (>= 1.2)
- speexdsp (only for UI client) - speexdsp (only for UI client)
- curl (only if building with http support) - curl (only if building with http support)
- nlohmann-json (>= 3.6.0) - nlohmann-json (>= 3.9.0)
- openssl (>= 1.0; only if building with multiplayer support) - openssl (>= 1.0; only if building with multiplayer support)
- icu (>= 59.0) - icu (>= 59.0)
- zlib - zlib

6
src/openrct2/core/Json.hpp
View file

@ -15,9 +15,9 @@
#include <string> #include <string>
#include <string_view> #include <string_view>
#if NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 6) #if NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 9)
# error "Unsupported version of nlohmann json library, must be >= 3.6" # error "Unsupported version of nlohmann json library, must be >= 3.9"
#endif // NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 6) #endif // NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 9)
using json_t = nlohmann::json; using json_t = nlohmann::json;