The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2024-12-26 12:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix "fixup_bundle: not a valid bundle" issue on xcode builds. (#519)

Browse Source
This commit is contained in:
Tanmay 2024-12-23 16:44:54 +05:30 committed by GitHub
parent bed19044da
commit f5279a2552
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/macos/fixup_bundle.cmake vendored
View File

@ -1,8 +1,14 @@
include(BundleUtilities) include(BundleUtilities)
# Xcode generator puts the build type in the build directory
set(BUILD_PREFIX "")
if (CMAKE_GENERATOR STREQUAL "Xcode")
set(BUILD_PREFIX "${CMAKE_BUILD_TYPE}/")
endif()
# Use generator expressions to get the absolute path to the bundle and frameworks # Use generator expressions to get the absolute path to the bundle and frameworks
set(APPS "Zelda64Recompiled.app/Contents/MacOS/Zelda64Recompiled") set(APPS "${BUILD_PREFIX}Zelda64Recompiled.app/Contents/MacOS/Zelda64Recompiled")
set(DIRS "Zelda64Recompiled.app/Contents/Frameworks") set(DIRS "${BUILD_PREFIX}Zelda64Recompiled.app/Contents/Frameworks")
# The fixup_bundle command needs an absolute path # The fixup_bundle command needs an absolute path
file(REAL_PATH ${APPS} APPS) file(REAL_PATH ${APPS} APPS)

2
CMakeLists.txt
View File

@ -355,7 +355,7 @@ if (APPLE)
# Post-build steps for macOS bundle # Post-build steps for macOS bundle
add_custom_command(TARGET Zelda64Recompiled POST_BUILD add_custom_command(TARGET Zelda64Recompiled POST_BUILD
# Copy and fix frameworks first # Copy and fix frameworks first
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/.github/macos/fixup_bundle.cmake COMMAND ${CMAKE_COMMAND} -D CMAKE_BUILD_TYPE=$<CONFIG> -D CMAKE_GENERATOR=${CMAKE_GENERATOR} -P ${CMAKE_SOURCE_DIR}/.github/macos/fixup_bundle.cmake
# Copy all resources # Copy all resources
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/temp_assets COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/temp_assets