From 1dead6a4c8f934a57001fe228e60fa385390b685 Mon Sep 17 00:00:00 2001 From: Sjoerd de Bruin Date: Wed, 2 Oct 2024 06:40:18 +0200 Subject: [PATCH] Fix #22880: macOS builds lack asset packs and scenario patches (#22881) * Fix #22880: macOS builds lack asset packs and scenario patches * Be sure to copy assetpack folder * Add changelog entry --- distribution/changelog.txt | 1 + src/openrct2-ui/CMakeLists.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9b7a2cd070..9a169a34b9 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -32,6 +32,7 @@ - Fix: [#22774] Fix entities leaving stale pixels on the screen when the framerate is uncapped. - Fix: [#22805] Fix deadzone when panning the view in positive axis directions. - Fix: [#22857] Side-Friction Roller Coaster train clips through slopes. +- Fix: [#22880] macOS builds lack asset packs and scenario patches. - Fix: [objects#346] Invalid refund price for Brick Base Block scenery item. 0.4.14 (2024-09-01) diff --git a/src/openrct2-ui/CMakeLists.txt b/src/openrct2-ui/CMakeLists.txt index 34786847c2..a9b1986b16 100644 --- a/src/openrct2-ui/CMakeLists.txt +++ b/src/openrct2-ui/CMakeLists.txt @@ -214,11 +214,12 @@ if(MACOS_BUNDLE) set(MACOSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}") set(PRODUCT_NAME "${OUTPUT_NAME}") - # copy data + # Copy data file(COPY ${SOURCE_DATA_DIR}/language DESTINATION "${BUNDLE_RESOURCE_DIR}") + file(COPY ${SOURCE_DATA_DIR}/scenario_patches DESTINATION "${BUNDLE_RESOURCE_DIR}") file(COPY ${SOURCE_DATA_DIR}/shaders DESTINATION "${BUNDLE_RESOURCE_DIR}") - # download objects and sequences + # Download objects and sequences set(OBJECTS_DIR ${CMAKE_BINARY_DIR}/object) set(TITLE_SEQUENCE_DIR ${CMAKE_BINARY_DIR}/sequence) download_openrct2_zip( @@ -235,7 +236,8 @@ if(MACOS_BUNDLE) SHA1 ${TITLE_SEQUENCE_SHA1} ) - # download opensfx and openmsx + # Download opensfx and openmsx + set(ASSET_PACK_DIR ${CMAKE_BINARY_DIR}/assetpack) download_openrct2_zip( ZIP_VERSION ${OPENSFX_VERSION} DOWNLOAD_DIR ${CMAKE_BINARY_DIR} @@ -249,8 +251,10 @@ if(MACOS_BUNDLE) SHA1 ${OPENMSX_SHA1} ) + # Copy downloaded data file(COPY ${OBJECTS_DIR} DESTINATION "${BUNDLE_RESOURCE_DIR}") file(COPY ${TITLE_SEQUENCE_DIR} DESTINATION "${BUNDLE_RESOURCE_DIR}") + file(COPY ${ASSET_PACK_DIR} DESTINATION "${BUNDLE_RESOURCE_DIR}") # Create as a bundle set_target_properties(${PROJECT_NAME} PROPERTIES