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

17
make-macosx.sh
View file

@ -43,10 +43,18 @@ unset ARCH_SDK
unset ARCH_CFLAGS
unset ARCH_MACOSX_VERSION_MIN
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk
ARCH_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
# SDL 2.0.1 (ppc) supports MacOSX 10.5
# SDL 2.0.5+ (x86, x86_64) supports MacOSX 10.6 and later
if [ $BUILDARCH = "ppc" ]; then
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk
ARCH_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
fi
ARCH_MACOSX_VERSION_MIN="10.5"
elif [ -d /Developer/SDKs/MacOSX10.6.sdk ]; then
ARCH_SDK=/Developer/SDKs/MacOSX10.6.sdk
ARCH_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
ARCH_MACOSX_VERSION_MIN="10.6"
else
ARCH_MACOSX_VERSION_MIN="10.7"
fi
@ -71,4 +79,7 @@ NCPU=`sysctl -n hw.ncpu`
# use the following shell script to build an application bundle
export MACOSX_DEPLOYMENT_TARGET="${ARCH_MACOSX_VERSION_MIN}"
export MACOSX_DEPLOYMENT_TARGET_PPC=
export MACOSX_DEPLOYMENT_TARGET_X86=
export MACOSX_DEPLOYMENT_TARGET_X86_64=
"./make-macosx-app.sh" release ${BUILDARCH}