mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: [bundle] custom launch.sh is no longer required for Mac OS
Co-authored-by: Owen Rudge <owen@owenrudge.net>
This commit is contained in:
parent
2714e0a33f
commit
7cdf7c7ca0
|
@ -7,7 +7,11 @@ if(OPTION_INSTALL_FHS)
|
||||||
set(DOCS_DESTINATION_DIR "${CMAKE_INSTALL_DOCDIR}")
|
set(DOCS_DESTINATION_DIR "${CMAKE_INSTALL_DOCDIR}")
|
||||||
set(MAN_DESTINATION_DIR "${CMAKE_INSTALL_MANDIR}")
|
set(MAN_DESTINATION_DIR "${CMAKE_INSTALL_MANDIR}")
|
||||||
else()
|
else()
|
||||||
set(BINARY_DESTINATION_DIR ".")
|
if(APPLE)
|
||||||
|
set(BINARY_DESTINATION_DIR "../MacOS")
|
||||||
|
else()
|
||||||
|
set(BINARY_DESTINATION_DIR ".")
|
||||||
|
endif()
|
||||||
set(DATA_DESTINATION_DIR ".")
|
set(DATA_DESTINATION_DIR ".")
|
||||||
set(DOCS_DESTINATION_DIR ".")
|
set(DOCS_DESTINATION_DIR ".")
|
||||||
set(MAN_DESTINATION_DIR ".")
|
set(MAN_DESTINATION_DIR ".")
|
||||||
|
|
|
@ -3,7 +3,6 @@ string(TIMESTAMP CURRENT_YEAR "%Y")
|
||||||
set(CPACK_BUNDLE_NAME "OpenTTD")
|
set(CPACK_BUNDLE_NAME "OpenTTD")
|
||||||
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/os/macosx/openttd.icns")
|
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/os/macosx/openttd.icns")
|
||||||
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
|
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
|
||||||
set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/os/macosx/launch.sh")
|
|
||||||
set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/os/macosx/splash.png")
|
set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/os/macosx/splash.png")
|
||||||
set(CPACK_DMG_FORMAT "UDBZ")
|
set(CPACK_DMG_FORMAT "UDBZ")
|
||||||
|
|
||||||
|
@ -20,7 +19,7 @@ install(
|
||||||
"
|
"
|
||||||
include(BundleUtilities)
|
include(BundleUtilities)
|
||||||
set(BU_CHMOD_BUNDLE_ITEMS TRUE)
|
set(BU_CHMOD_BUNDLE_ITEMS TRUE)
|
||||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/openttd\" \"\" \"\")
|
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/openttd\" \"\" \"\")
|
||||||
"
|
"
|
||||||
DESTINATION .
|
DESTINATION .
|
||||||
COMPONENT Runtime)
|
COMPONENT Runtime)
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
ROOT_DIR=$(dirname "$0")/..
|
|
||||||
|
|
||||||
export DYLD_LIBRARY_PATH=${ROOT_DIR}/Frameworks
|
|
||||||
|
|
||||||
cd ${ROOT_DIR}/Resources
|
|
||||||
exec ./openttd "$@"
|
|
Loading…
Reference in New Issue