From d5b769bcc438fc4f2792cc79e8705e65112b1097 Mon Sep 17 00:00:00 2001 From: Enriath Date: Sun, 24 Nov 2024 19:09:48 +0000 Subject: [PATCH] Require the correct minimum version of nlohmann json --- debian/control | 2 +- readme.md | 2 +- src/openrct2/core/Json.hpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index cda461f2c9..92701ff896 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: misc Priority: optional Standards-Version: 3.9.2 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 Architecture: any diff --git a/readme.md b/readme.md index 83b455715f..482cddf14e 100644 --- a/readme.md +++ b/readme.md @@ -128,7 +128,7 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo - libpng (>= 1.2) - speexdsp (only for UI client) - 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) - icu (>= 59.0) - zlib diff --git a/src/openrct2/core/Json.hpp b/src/openrct2/core/Json.hpp index c66ffd6ece..43490d1c1c 100644 --- a/src/openrct2/core/Json.hpp +++ b/src/openrct2/core/Json.hpp @@ -15,9 +15,9 @@ #include #include -#if NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 6) -# error "Unsupported version of nlohmann json library, must be >= 3.6" -#endif // 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.9" +#endif // NLOHMANN_JSON_VERSION_MAJOR < 3 || (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR < 9) using json_t = nlohmann::json;