diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f0705e9a2..fd75803adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ if (NOT PNG_FOUND) endif (NOT PNG_FOUND) PKG_CHECK_MODULES(ZLIB REQUIRED zlib) -PKG_CHECK_MODULES(JANSSON REQUIRED jansson>=2.7) +PKG_CHECK_MODULES(JANSSON REQUIRED jansson>=2.3) # Handle creating the rct2 text and data files on macOS and Linux # See details in src/openrct2.c:openrct2_setup_rct2_segment for how the values diff --git a/debian/control b/debian/control index 562e118de3..4ab49c7b75 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, libsdl2-dev, libsdl2-ttf-dev, gcc, pkg-config, libjansson4 (>= 2.7), libjansson-dev (>= 2.7), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev +Build-Depends: debhelper (>= 9), cmake, libsdl2-dev, libsdl2-ttf-dev, gcc, pkg-config, libjansson4 (>= 2.3), libjansson-dev (>= 2.3), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev Package: openrct2 Architecture: any diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh index 10b946424a..668a29f31f 100755 --- a/scripts/linux/install.sh +++ b/scripts/linux/install.sh @@ -174,19 +174,11 @@ elif [[ $(uname) == "Linux" ]]; then sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get install --no-install-recommends -y --force-yes cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 gcc-4.8 pkg-config:i386 g++-4.8-multilib gcc-4.8-multilib libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 clang libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 - download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson4_2.7-1ubuntu1_i386.deb libjansson4_2.7-1ubuntu1_i386.deb - download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson-dev_2.7-1ubuntu1_i386.deb libjansson-dev_2.7-1ubuntu1_i386.deb - sudo dpkg -i libjansson4_2.7-1ubuntu1_i386.deb - sudo dpkg -i libjansson-dev_2.7-1ubuntu1_i386.deb sudo apt-get install -f ;; "linux64") sudo apt-get update sudo apt-get install --no-install-recommends -y --force-yes cmake libsdl2-dev libsdl2-ttf-dev gcc-4.8 pkg-config g++ gcc libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev - download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson4_2.7-1ubuntu1_amd64.deb libjansson4_2.7-1ubuntu1_amd64.deb - download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson-dev_2.7-1ubuntu1_amd64.deb libjansson-dev_2.7-1ubuntu1_amd64.deb - sudo dpkg -i libjansson4_2.7-1ubuntu1_amd64.deb - sudo dpkg -i libjansson-dev_2.7-1ubuntu1_amd64.deb sudo apt-get install -f ;; "windows")