1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00

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
This commit is contained in:
Sjoerd de Bruin
2024-10-02 06:40:18 +02:00
committed by GitHub
parent d5d8258524
commit 1dead6a4c8
2 changed files with 8 additions and 3 deletions

View File

@@ -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)

View File

@@ -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