Upgrades to Xcode project and Apple Silicon support

- Reorganized Xcode project
- Added missionpack support to Xcode project
- Incorporated changes from MaddTheSane for Apple Silicon support https://github.com/maddthesane/ioq3
- Built SDL 2.0.14 for Apple Siicon, added to existing SDL dylib
- Built SDLMain for Apple Silicon, added to existing libSDL2main.a
This commit is contained in:
Tom Kidd 2021-01-28 17:37:23 -06:00
parent b8be5a8bd7
commit 52a43ae1c4
42 changed files with 936 additions and 756 deletions

View file

@ -14,6 +14,7 @@ if [ $# == 0 ] || [ $# -gt 2 ]; then
echo " x86"
echo " x86_64"
echo " ppc"
echo " arm64"
echo
exit 1
fi
@ -41,6 +42,8 @@ if [ "$2" != "" ]; then
CURRENT_ARCH="x86_64"
elif [ "$2" == "ppc" ]; then
CURRENT_ARCH="ppc"
elif [ "$2" == "arm64" ]; then
CURRENT_ARCH="arm64"
else
echo "Invalid architecture: $2"
echo "Valid architectures are:"
@ -78,6 +81,7 @@ function symlinkArch()
IS32=`file "${SRCFILE}.${EXT}" | grep "i386"`
IS64=`file "${SRCFILE}.${EXT}" | grep "x86_64"`
ISPPC=`file "${SRCFILE}.${EXT}" | grep "ppc"`
ISARM=`file "${SRCFILE}.${EXT}" | grep "arm64"`
if [ "${IS32}" != "" ]; then
if [ ! -L "${DSTFILE}x86.${EXT}" ]; then
@ -103,6 +107,14 @@ function symlinkArch()
rm "${DSTFILE}ppc.${EXT}"
fi
if [ "${ISARM}" != "" ]; then
if [ ! -L "${DSTFILE}arm64.${EXT}" ]; then
ln -s "${SRCFILE}.${EXT}" "${DSTFILE}arm64.${EXT}"
fi
elif [ -L "${DSTFILE}arm64.${EXT}" ]; then
rm "${DSTFILE}arm64.${EXT}"
fi
popd > /dev/null
}
@ -110,6 +122,7 @@ SEARCH_ARCHS=" \
x86 \
x86_64 \
ppc \
arm64 \
"
HAS_LIPO=`command -v lipo`
@ -314,7 +327,7 @@ PLIST="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>"
if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ]; then
if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_ARM64}" ]; then
PLIST="${PLIST}
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>"
@ -336,6 +349,11 @@ if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_
<key>x86_64</key>
<string>${MACOSX_DEPLOYMENT_TARGET_X86_64}</string>"
fi
if [ -n "${MACOSX_DEPLOYMENT_TARGET_ARM64}" ]; then
PLIST="${PLIST}
<key>arm64</key>
<string>${MACOSX_DEPLOYMENT_TARGET_ARM64}</string>"
fi
PLIST="${PLIST}
</dict>"