okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make macOS Universal Bundle target 10.6 for x86 and x86_64

Browse source 
SDL 2.0.5 dropped support for macOS 10.5 so target 10.6 instead. The
PPC build uses SDL 2.0.1 so it still targets 10.5. macOS 10.5 (x86,
x86_64) should automatically run the PPC build using Rosetta.

Revert MAN-AT-ARMS' change to SDL 2.0.8 SDL_platform.h that allowed
targeting macOS 10.5 for the sake of PPC. It also incorrectly allowed
x86 and x86_64 to target 10.5 as well. (Also macOS PPC uses separate
headers now.)
This commit is contained in:
Zack Middleton 2018-04-24 17:24:15 -05:00
parent 92935df37b
commit 9a0ee67e04
4 changed files with 77 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
make-macosx-app.sh
View file

@ -283,7 +283,9 @@ fi
cp code/libs/macosx/*.dylib "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}"
cp ${ICNSDIR}/${ICNS} "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/$ICNS" || exit 1;
echo -n ${PKGINFO} > "${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/PkgInfo" || exit 1;
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
# create Info.Plist
PLIST="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
<plist version=\"1.0\">
<dict>
@ -310,14 +312,44 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<key>CGDisableCoalescedUpdates</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>"
if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ]; then
PLIST="${PLIST}
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>"
if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ]; then
PLIST="${PLIST}
<key>ppc</key>
<string>${MACOSX_DEPLOYMENT_TARGET_PPC}</string>"
fi
if [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ]; then
PLIST="${PLIST}
<key>i386</key>
<string>${MACOSX_DEPLOYMENT_TARGET_X86}</string>"
fi
if [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ]; then
PLIST="${PLIST}
<key>x86_64</key>
<string>${MACOSX_DEPLOYMENT_TARGET_X86_64}</string>"
fi
PLIST="${PLIST}
</dict>"
fi
PLIST="${PLIST}
<key>NSHumanReadableCopyright</key>
<string>QUAKE III ARENA Copyright © 1999-2000 id Software, Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
" > "${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info.plist"
"
echo -e "${PLIST}" > "${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info.plist"
# action takes care of generating universal binaries if lipo is available
# otherwise, it falls back to using a simple copy, expecting the first item in