mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-21 19:41:36 +00:00
22a0949a26
Upgrade to build and run from VS2019 Upgrades to Xcode project and Apple Silicon support Update SDL2 to 2.0.14 Updated SDL2 include files to fix Mac build in GitHub Actions Added another mention of arm64 to command line help Restored original opus sse files, excluded from Xcode Added arm64 to the post-build symlinking step Merge branch 'main' into xcode Merge branch 'main' into vs2019 Added shell script to compile Universal 2 binary (x86_64+arm64) Reverting alert style to deprecated methods Upgrades to Xcode project and Apple Silicon support Update SDL2 to 2.0.14 Added another mention of arm64 to command line help Restored original opus sse files, excluded from Xcode Added arm64 to the post-build symlinking step Added shell script to compile Universal 2 binary (x86_64+arm64) Reverting alert style to deprecated methods Merge branch 'xcode' of https://github.com/tomkidd/ioq3 into xcode Removed signature from SDL dylib, enabled dark mode on macOS. spaces > tabs Ad-hoc signed libSDL2-2.0.0.dylib Fix compiling against SDL 2.0.17 UB2 now signs and notarizes, upgraded to SDL 2.0.16 Architectures in libSDL2 restored for ppc and i386 Merge remote-tracking branch 'upstream/main' into vs2019 Update SDL2 to 2.0.16 Added rudimentary support for automatically finding Microsoft Store version of Quake 3 GHA deprecated Ubuntu 16.04 - update to 18.04 qsort cannot be called with NULL Merge remote-tracking branch 'upstream/main' into vs2019 Addressed string concatenation issue and added dummy method for Mac/Linux Added missing variable. Merge remote-tracking branch 'upstream/main' into xcode Updated SDL 2.0.16 headers and Mac version of libraries to fix GitHub actions Addressed PR suggestions Modified MS Store path handling to better follow the pattern of Steam/GOG Merge pull request #481 from tomkidd/xcode Merge pull request #482 from tomkidd/vs2019 OpenGL2: Fix r_grayscale 1 making everything solid black Print full GL_EXTENSIONS list for OpenGL contexts before 3.0 Fix being unable to enter Team Arena CD key OpenGL2: GL_DEPTH_TEXTURE_MODE was removed from OpenGL 3.0/Core Improve setting Microsoft Store path Update building for macOS in README Make macOS arm64 default to target macOS 11 in Makefile Fix error when cross-compiling for macOS arm64 using Makefile Fix passing arguments to VM dylib on Apple M1 Fix compiling on older macOS Fix memory corruption in S_TransferPaintBuffer Fix memset Fix hex digit Fix uninitialized variable some old URL and doc updates Update README.md Update FUNDING.yml code/curl: update ifdef condition for MCST-LCC compiler in mcst-lcc compiler => 1.25 added a new macro definition to determine compiler Revert "code/curl: update ifdef condition for MCST-LCC compiler" Revert "E2K: fixed build by MCST lcc compiler when using USE_CURL=1 option" More predictable mesh normals generation vm_x86.c: Add `defined(_M_IX86) || defined(_M_X64)` (fix for VS2019) Add keys for SDL 2.0.14's new gamepad buttons Fix in_availableJoysticks cvar not updating Fix (disabled) Wavelet sound decompression Update to SDL 2.24.0 and add separate macOS UB2 dylib Update macOS UB1 to SDL 2.0.22 Fix running make-macosx{,-ub2}.sh on Linux Update MSVC .lib files to SDL 2.24.0
113 lines
3.6 KiB
Bash
Executable file
113 lines
3.6 KiB
Bash
Executable file
#!/bin/bash
|
|
CC=gcc-4.0
|
|
|
|
cd `dirname $0`
|
|
if [ ! -f Makefile ]; then
|
|
echo "This script must be run from the ioquake3 build directory"
|
|
exit 1
|
|
fi
|
|
|
|
# we want to use the oldest available SDK for max compatibility. However 10.4 and older
|
|
# can not build 64bit binaries, making 10.5 the minimum version. This has been tested
|
|
# with xcode 3.1 (xcode31_2199_developerdvd.dmg). It contains the 10.5 SDK and a decent
|
|
# enough gcc to actually compile ioquake3
|
|
# For PPC macs, G4's or better are required to run ioquake3.
|
|
|
|
unset X86_64_SDK
|
|
unset X86_64_CFLAGS
|
|
unset X86_64_MACOSX_VERSION_MIN
|
|
unset X86_SDK
|
|
unset X86_CFLAGS
|
|
unset X86_MACOSX_VERSION_MIN
|
|
unset PPC_SDK
|
|
unset PPC_CFLAGS
|
|
unset PPC_MACOSX_VERSION_MIN
|
|
|
|
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
|
|
X86_64_SDK=/Developer/SDKs/MacOSX10.5.sdk
|
|
X86_64_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
|
X86_64_MACOSX_VERSION_MIN="10.5"
|
|
|
|
X86_SDK=/Developer/SDKs/MacOSX10.5.sdk
|
|
X86_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
|
X86_MACOSX_VERSION_MIN="10.5"
|
|
|
|
PPC_SDK=/Developer/SDKs/MacOSX10.5.sdk
|
|
PPC_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
|
PPC_MACOSX_VERSION_MIN="10.5"
|
|
fi
|
|
|
|
# SDL 2.0.5+ (x86, x86_64) only supports MacOSX 10.6 and later
|
|
if [ -d /Developer/SDKs/MacOSX10.6.sdk ]; then
|
|
X86_64_SDK=/Developer/SDKs/MacOSX10.6.sdk
|
|
X86_64_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
|
|
X86_64_MACOSX_VERSION_MIN="10.6"
|
|
|
|
X86_SDK=/Developer/SDKs/MacOSX10.6.sdk
|
|
X86_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
|
|
X86_MACOSX_VERSION_MIN="10.6"
|
|
else
|
|
# Don't try to compile with 10.5 version min
|
|
X86_64_SDK=
|
|
X86_SDK=
|
|
fi
|
|
# end SDL 2.0.5
|
|
|
|
if [ -z $X86_64_SDK ] || [ -z $X86_SDK ] || [ -z $PPC_SDK ]; then
|
|
echo "\
|
|
ERROR: This script is for building a Universal Binary. You cannot build
|
|
for a different architecture unless you have the proper Mac OS X SDKs
|
|
installed. If you just want to to compile for your own system run
|
|
'make-macosx.sh' instead of this script.
|
|
|
|
In order to build a binary with maximum compatibility you must
|
|
build on Mac OS X 10.6 and have the MacOSX10.5 and MacOSX10.6
|
|
SDKs installed from the Xcode install disk Packages folder."
|
|
|
|
exit 1
|
|
fi
|
|
|
|
echo "Building X86_64 Client/Dedicated Server against \"$X86_64_SDK\""
|
|
echo "Building X86 Client/Dedicated Server against \"$X86_SDK\""
|
|
echo "Building PPC Client/Dedicated Server against \"$PPC_SDK\""
|
|
echo
|
|
|
|
# For parallel make on multicore boxes...
|
|
SYSCTL_PATH=`command -v sysctl 2> /dev/null`
|
|
if [ -n "$SYSCTL_PATH" ]; then
|
|
NCPU=`sysctl -n hw.ncpu`
|
|
else
|
|
# osxcross on linux
|
|
NCPU=`nproc`
|
|
fi
|
|
|
|
# x86_64 client and server
|
|
#if [ -d build/release-release-x86_64 ]; then
|
|
# rm -r build/release-darwin-x86_64
|
|
#fi
|
|
(PLATFORM=darwin ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS MACOSX_VERSION_MIN=$X86_64_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
|
|
|
echo;echo
|
|
|
|
# x86 client and server
|
|
#if [ -d build/release-darwin-x86 ]; then
|
|
# rm -r build/release-darwin-x86
|
|
#fi
|
|
(PLATFORM=darwin ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS MACOSX_VERSION_MIN=$X86_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
|
|
|
echo;echo
|
|
|
|
# PPC client and server
|
|
#if [ -d build/release-darwin-ppc ]; then
|
|
# rm -r build/release-darwin-ppc
|
|
#fi
|
|
(PLATFORM=darwin ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS MACOSX_VERSION_MIN=$PPC_MACOSX_VERSION_MIN make -j$NCPU) || exit 1;
|
|
|
|
echo
|
|
|
|
# use the following shell script to build a universal application bundle
|
|
export MACOSX_DEPLOYMENT_TARGET="10.5"
|
|
export MACOSX_DEPLOYMENT_TARGET_PPC="$PPC_MACOSX_VERSION_MIN"
|
|
export MACOSX_DEPLOYMENT_TARGET_X86="$X86_MACOSX_VERSION_MIN"
|
|
export MACOSX_DEPLOYMENT_TARGET_X86_64="$X86_64_MACOSX_VERSION_MIN"
|
|
"./make-macosx-app.sh" release
|