From be0ca5a1d233d505a75037dba290ee7ba79eaf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 7 Jul 2024 11:41:18 +0200 Subject: [PATCH] Update libraries to v36 (#22235) Downgrade breakpad Fixes #22003 --- CMakeLists.txt | 4 ++-- openrct2.common.props | 2 +- openrct2.proj | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ff5e8c50d..0142c4b5e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,9 +129,9 @@ if (MACOS_USE_DEPENDENCIES) # if we're building on macOS, then we need the dependencies include(cmake/download.cmake) - set(MACOS_DYLIBS_VERSION "35") + set(MACOS_DYLIBS_VERSION "36") set(MACOS_DYLIBS_ZIPFILE "openrct2-libs-v${MACOS_DYLIBS_VERSION}-universal-macos-dylibs.zip") - set(MACOS_DYLIBS_SHA1 "bed4340c32b6dbee9634ceaf19cb6b49a837aead") + set(MACOS_DYLIBS_SHA1 "1a41c1afed40e0f63daf0b6612c50e8cb8cda495") set(MACOS_DYLIBS_DIR "${ROOT_DIR}/lib/macos") set(MACOS_DYLIBS_URL "https://github.com/OpenRCT2/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}") diff --git a/openrct2.common.props b/openrct2.common.props index 5091ca81a7..89776e4560 100644 --- a/openrct2.common.props +++ b/openrct2.common.props @@ -115,7 +115,7 @@ - $(SolutionDir)src;$(SolutionDir)src\thirdparty;$(SolutionDir)src\thirdparty\duktape;$(SolutionDir)lib\$(Platform)\include;$(SolutionDir)lib\$(Platform)\include\SDL2;$(IncludePath) + $(SolutionDir)src;$(SolutionDir)src\thirdparty;$(SolutionDir)src\thirdparty\duktape;$(SolutionDir)lib\$(Platform)\include;$(SolutionDir)lib\$(Platform)\include\SDL2;$(SolutionDir)lib\$(Platform)\include\crashpad;$(IncludePath) $(SolutionDir)lib\$(Platform)\debug\lib;$(LibraryPath) $(SolutionDir)lib\$(Platform)\lib;$(LibraryPath) diff --git a/openrct2.proj b/openrct2.proj index 0712dae46d..e001693d4d 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -37,12 +37,12 @@ $(RootDir).dependencies - https://github.com/OpenRCT2/Dependencies/releases/download/v35/openrct2-libs-v35-arm64-windows-static.zip - 89f119395c4347f25427990eb47ea8f57bba95d8 - https://github.com/OpenRCT2/Dependencies/releases/download/v35/openrct2-libs-v35-x64-windows-static.zip - 1303b2423be26f40bdb75fa2c91f1bc7ef1de1ed - https://github.com/OpenRCT2/Dependencies/releases/download/v35/openrct2-libs-v35-x86-windows-static.zip - f3636b530110c7592deab23ca0d0c1916fc7e44c + https://github.com/OpenRCT2/Dependencies/releases/download/v36/openrct2-libs-v36-arm64-windows-static.zip + c3cf49093261e605f3d62c5e82e53ff5e7600661 + https://github.com/OpenRCT2/Dependencies/releases/download/v36/openrct2-libs-v36-x64-windows-static.zip + 3816671560af3571ada728ffeceec0443471c03b + https://github.com/OpenRCT2/Dependencies/releases/download/v36/openrct2-libs-v36-x86-windows-static.zip + d2b8d98a9711cf319e3bd5330e77aef5395820f1 https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/title-sequences.zip 80fefc6ebbabc42a6f4703412daa5c62f661420d https://github.com/OpenRCT2/objects/releases/download/v1.4.6/objects.zip