mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 01:22:25 +01:00
Code Issues Releases Wiki Activity

Update macos libraries to v38, use SHA256 checksums (#24889)

Browse Source
This commit is contained in:
Michał Janiszewski
2025-08-04 18:09:32 +02:00
committed by GitHub
parent 6fd7cddf58
commit 47d202f08a
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -68,23 +68,23 @@ set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(TITLE_SEQUENCE_VERSION "0.4.14") set(TITLE_SEQUENCE_VERSION "0.4.14")
set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip") set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip")
set(TITLE_SEQUENCE_SHA1 "6c04781b959b468e1f65ec2d2f21f5aaa5e5724d") set(TITLE_SEQUENCE_SHA256 "140df714e806fed411cc49763e7f16b0fcf2a487a57001d1e50fce8f9148a9f3")
set(OBJECTS_VERSION "1.7.2") set(OBJECTS_VERSION "1.7.2")
set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
set(OBJECTS_SHA1 "ab0f05744105528067c6403a9e837fb6a2c52f74") set(OBJECTS_SHA256 "b4286f7af68a61b0f7fc6e379ba37bf6796286d73e97c967958bf374e3f98f35")
set(OPENSFX_VERSION "1.0.6") set(OPENSFX_VERSION "1.0.6")
set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip") set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")
set(OPENSFX_SHA1 "e8b6f24b3fb9d1ed5dc27022a50aaea98923d872") set(OPENSFX_SHA256 "06b90f3e19c216752df441d551b26a9e3e1ba7755bdd2102504b73bf993608be")
set(OPENMSX_VERSION "1.6.1") set(OPENMSX_VERSION "1.6.1")
set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip") set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
set(OPENMSX_SHA1 "5168c852b1a10b623c10f0ff2a590ba494df4edb") set(OPENMSX_SHA256 "994b350d3b180ee1cb9619fe27f7ebae3a1a5232840c4bd47a89f33fa89de1a1")
set(REPLAYS_VERSION "0.0.89") set(REPLAYS_VERSION "0.0.89")
set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
set(REPLAYS_SHA1 "089CB8EEA76A98028367FDDE72675E9309AB9036") set(REPLAYS_SHA256 "04607bb1f67a0f31d841ed70b38d65b8f7a9e19749e414ff74b8a434bc90b42a")
option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
option(WITH_TESTS "Build tests") option(WITH_TESTS "Build tests")
@@ -142,9 +142,9 @@ if (MACOS_USE_DEPENDENCIES)
# if we're building on macOS, then we need the dependencies # if we're building on macOS, then we need the dependencies
include(cmake/download.cmake) include(cmake/download.cmake)
set(MACOS_DYLIBS_VERSION "37") set(MACOS_DYLIBS_VERSION "38")
set(MACOS_DYLIBS_ZIPFILE "openrct2-libs-v${MACOS_DYLIBS_VERSION}-universal-macos-dylibs.zip") set(MACOS_DYLIBS_ZIPFILE "openrct2-libs-v${MACOS_DYLIBS_VERSION}-universal-macos-dylibs.zip")
set(MACOS_DYLIBS_SHA1 "6d633a881fc243e960e29d9c371915a7cdeeb880") set(MACOS_DYLIBS_SHA256 "900f298be7bf2b8469d0b9f1700f09a61ded3daafea32f599d58c88b6d7c9ce7")
set(MACOS_DYLIBS_DIR "${ROOT_DIR}/lib/macos") 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}") set(MACOS_DYLIBS_URL "https://github.com/OpenRCT2/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}")
@@ -152,7 +152,7 @@ if (MACOS_USE_DEPENDENCIES)
ZIP_VERSION ${MACOS_DYLIBS_VERSION} ZIP_VERSION ${MACOS_DYLIBS_VERSION}
DOWNLOAD_DIR ${MACOS_DYLIBS_DIR} DOWNLOAD_DIR ${MACOS_DYLIBS_DIR}
ZIP_URL ${MACOS_DYLIBS_URL} ZIP_URL ${MACOS_DYLIBS_URL}
SHA1 ${MACOS_DYLIBS_SHA1} SHA256 ${MACOS_DYLIBS_SHA256}
) )
set(CMAKE_MACOSX_RPATH 1) set(CMAKE_MACOSX_RPATH 1)
@@ -453,7 +453,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/sequence/ DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/sequence/
SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/sequence/ SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/sequence/
ZIP_URL ${TITLE_SEQUENCE_URL} ZIP_URL ${TITLE_SEQUENCE_URL}
SHA1 ${TITLE_SEQUENCE_SHA1} SHA256 ${TITLE_SEQUENCE_SHA256}
)") )")
endif () endif ()
if (DOWNLOAD_OBJECTS) if (DOWNLOAD_OBJECTS)
@@ -467,7 +467,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/object/ DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/object/
SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/object/ SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/object/
ZIP_URL ${OBJECTS_URL} ZIP_URL ${OBJECTS_URL}
SHA1 ${OBJECTS_SHA1} SHA256 ${OBJECTS_SHA256}
)") )")
endif () endif ()
if (DOWNLOAD_OPENSFX) if (DOWNLOAD_OPENSFX)
@@ -478,7 +478,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/assetpack/openrct2.sound.parkap SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/assetpack/openrct2.sound.parkap
DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/ DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/
ZIP_URL ${OPENSFX_URL} ZIP_URL ${OPENSFX_URL}
SHA1 ${OPENSFX_SHA1} SHA256 ${OPENSFX_SHA256}
)") )")
endif () endif ()
if (DOWNLOAD_OPENMSX) if (DOWNLOAD_OPENMSX)
@@ -489,7 +489,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/assetpack/openrct2.music.alternative.parkap SKIP_IF_EXISTS ${CMAKE_SOURCE_DIR}/data/assetpack/openrct2.music.alternative.parkap
DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/ DOWNLOAD_DIR \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/openrct2/
ZIP_URL ${OPENMSX_URL} ZIP_URL ${OPENMSX_URL}
SHA1 ${OPENMSX_SHA1} SHA256 ${OPENMSX_SHA256}
)") )")
endif () endif ()
if (DOWNLOAD_REPLAYS) if (DOWNLOAD_REPLAYS)
@@ -500,7 +500,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
ZIP_VERSION ${REPLAYS_VERSION} ZIP_VERSION ${REPLAYS_VERSION}
DOWNLOAD_DIR \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/ DOWNLOAD_DIR \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/
ZIP_URL ${REPLAYS_URL} ZIP_URL ${REPLAYS_URL}
SHA1 ${REPLAYS_SHA1} SHA256 ${REPLAYS_SHA256}
)") )")
endif () endif ()
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2")

4
cmake/download.cmake
View File

@@ -1,5 +1,5 @@
function(download_openrct2_zip) function(download_openrct2_zip)
set(oneValueArgs ZIP_VERSION DOWNLOAD_DIR ZIP_URL SHA1) set(oneValueArgs ZIP_VERSION DOWNLOAD_DIR ZIP_URL SHA256)
set(multiValueArgs SKIP_IF_EXISTS) set(multiValueArgs SKIP_IF_EXISTS)
cmake_parse_arguments(DOWNLOAD_OPENRCT2 "${options}" "${oneValueArgs}" cmake_parse_arguments(DOWNLOAD_OPENRCT2 "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN} ) "${multiValueArgs}" ${ARGN} )
@@ -32,7 +32,7 @@ function(download_openrct2_zip)
message("Downloading ${DOWNLOAD_OPENRCT2_ZIP_URL} to ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}") message("Downloading ${DOWNLOAD_OPENRCT2_ZIP_URL} to ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}")
file(DOWNLOAD file(DOWNLOAD
"${DOWNLOAD_OPENRCT2_ZIP_URL}" "${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}/${ZIP_FILE_NAME}" "${DOWNLOAD_OPENRCT2_ZIP_URL}" "${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}/${ZIP_FILE_NAME}"
EXPECTED_HASH SHA1=${DOWNLOAD_OPENRCT2_SHA1} SHOW_PROGRESS) EXPECTED_HASH SHA256=${DOWNLOAD_OPENRCT2_SHA256} SHOW_PROGRESS)
if(${CMAKE_VERSION} VERSION_LESS "3.18.0") if(${CMAKE_VERSION} VERSION_LESS "3.18.0")
execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR} ${CMAKE_COMMAND} -E tar xf ${ZIP_FILE_NAME}) execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR} ${CMAKE_COMMAND} -E tar xf ${ZIP_FILE_NAME})
else() else()

8
src/openrct2-ui/CMakeLists.txt
View File

@@ -236,14 +236,14 @@ if(MACOS_BUNDLE)
ZIP_VERSION ${OBJECTS_VERSION} ZIP_VERSION ${OBJECTS_VERSION}
DOWNLOAD_DIR ${OBJECTS_DIR} DOWNLOAD_DIR ${OBJECTS_DIR}
ZIP_URL ${OBJECTS_URL} ZIP_URL ${OBJECTS_URL}
SHA1 ${OBJECTS_SHA1} SHA256 ${OBJECTS_SHA256}
) )
download_openrct2_zip( download_openrct2_zip(
ZIP_VERSION ${TITLE_SEQUENCE_VERSION} ZIP_VERSION ${TITLE_SEQUENCE_VERSION}
DOWNLOAD_DIR ${TITLE_SEQUENCE_DIR} DOWNLOAD_DIR ${TITLE_SEQUENCE_DIR}
ZIP_URL ${TITLE_SEQUENCE_URL} ZIP_URL ${TITLE_SEQUENCE_URL}
SHA1 ${TITLE_SEQUENCE_SHA1} SHA256 ${TITLE_SEQUENCE_SHA256}
) )
# Download opensfx and openmsx # Download opensfx and openmsx
@@ -252,13 +252,13 @@ if(MACOS_BUNDLE)
ZIP_VERSION ${OPENSFX_VERSION} ZIP_VERSION ${OPENSFX_VERSION}
DOWNLOAD_DIR ${CMAKE_BINARY_DIR} DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
ZIP_URL ${OPENSFX_URL} ZIP_URL ${OPENSFX_URL}
SHA1 ${OPENSFX_SHA1} SHA256 ${OPENSFX_SHA256}
) )
download_openrct2_zip( download_openrct2_zip(
ZIP_VERSION ${OPENMSX_VERSION} ZIP_VERSION ${OPENMSX_VERSION}
DOWNLOAD_DIR ${CMAKE_BINARY_DIR} DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
ZIP_URL ${OPENMSX_URL} ZIP_URL ${OPENMSX_URL}
SHA1 ${OPENMSX_SHA1} SHA256 ${OPENMSX_SHA256}
) )
# Copy downloaded data # Copy downloaded data