teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-29 07:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Adapted the universal build script to work with the newer Makefile

Browse source 
since CFLAGS are sent to the linker now in addition to LDFLAGS
* Remove Mac OS X 10.2 support from the universal build script.
This commit is contained in:
Tony J. White = 2009-10-23 18:58:24 +00:00
parent 55943c51f3
commit 91e8fed743
1 changed files with 23 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
make-macosx-ub.sh
View file

@ -13,7 +13,7 @@ BIN_OBJ="
build/release-darwin-i386/ioquake3-smp.i386 build/release-darwin-i386/ioquake3-smp.i386
" "
BIN_DEDOBJ=" BIN_DEDOBJ="
build/release-darwin-ub/ioq3ded.ppc build/release-darwin-ppc/ioq3ded.ppc
build/release-darwin-i386/ioq3ded.i386 build/release-darwin-i386/ioq3ded.i386
" "
BASE_OBJ=" BASE_OBJ="
@ -43,91 +43,47 @@ Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
# We only care if we're >= 10.4, not if we're specifically Tiger. # We only care if we're >= 10.4, not if we're specifically Tiger.
# "8" is the Darwin major kernel version. # "8" is the Darwin major kernel version.
#TIGERHOST=`uname -r | grep ^8.`
TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'` TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'`
# we want to use the oldest available SDK for max compatiblity # we want to use the oldest available SDK for max compatiblity
unset PPC_CLIENT_SDK unset PPC_SDK
PPC_CLIENT_CC=gcc unset PPC_CFLAGS
unset PPC_CLIENT_CFLAGS unset PPC_LDFLAGS
unset PPC_CLIENT_LDFLAGS
unset PPC_SERVER_SDK
unset PPC_SERVER_CFLAGS
unset PPC_SERVER_LDFLAGS
unset X86_SDK unset X86_SDK
unset X86_CFLAGS unset X86_CFLAGS
unset X86_LDFLAGS unset X86_LDFLAGS
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.5.sdk PPC_SDK=/Developer/SDKs/MacOSX10.5.sdk
PPC_CLIENT_CC=gcc-4.0 PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \
PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1050" -DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
PPC_CLIENT_LDFLAGS="-arch ppc \ PPC_LDFLAGS=" -mmacosx-version-min=10.5"
-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-mmacosx-version-min=10.5"
PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.5.sdk
PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
X86_SDK=/Developer/SDKs/MacOSX10.5.sdk X86_SDK=/Developer/SDKs/MacOSX10.5.sdk
X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \ X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1050" -DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
X86_LDFLAGS="-arch i386 \ X86_LDFLAGS=" -mmacosx-version-min=10.5"
-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-mmacosx-version-min=10.5"
X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
fi fi
if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk PPC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
PPC_CLIENT_CC=gcc-4.0 PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1040" -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
PPC_CLIENT_LDFLAGS="-arch ppc \ PPC_LDFLAGS=" -mmacosx-version-min=10.4"
-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-mmacosx-version-min=10.4"
PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.4u.sdk
PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk
X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1040" -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
X86_LDFLAGS="-arch i386 \ X86_LDFLAGS=" -mmacosx-version-min=10.4"
-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-mmacosx-version-min=10.4"
X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
fi fi
if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then
PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.3.9.sdk PPC_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
PPC_CLIENT_CC=gcc-4.0 PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -DMAC_OS_X_VERSION_MIN_REQUIRED=1030"
PPC_CLIENT_LDFLAGS="-arch ppc \ PPC_LDFLAGS=" -mmacosx-version-min=10.3"
-isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-mmacosx-version-min=10.3"
PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
fi fi
if [ -d /Developer/SDKs/MacOSX10.2.8.sdk ] && [ -x /usr/bin/gcc-3.3 ] && [ $TIGERHOST ]; then if [ -z $PPC_SDK ] || [ -z $X86_SDK ]; then
PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.2.8.sdk
PPC_CLIENT_CC=gcc-3.3
PPC_CLIENT_CFLAGS="-arch ppc \
-nostdinc \
-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-I/Developer/SDKs/MacOSX10.2.8.sdk/usr/include/gcc/darwin/3.3 \
-isystem /Developer/SDKs/MacOSX10.2.8.sdk/usr/include \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1020"
PPC_CLIENT_LDFLAGS="-arch ppc \
-L/Developer/SDKs/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3 \
-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk,-m"
fi
if [ -z $PPC_CLIENT_SDK ] || [ -z $PPC_SERVER_SDK ] || [ -z $X86_SDK ]; then
echo "\ echo "\
ERROR: This script is for building a Universal Binary. You cannot build 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 for a different architecture unless you have the proper Mac OS X SDKs
@ -136,17 +92,15 @@ ERROR: This script is for building a Universal Binary. You cannot build
exit 1 exit 1
fi fi
echo "Building PPC Dedicated Server against \"$PPC_SERVER_SDK\"" echo "Building PPC Client/Dedicated Server against \"$PPC_SDK\""
echo "Building PPC Client against \"$PPC_CLIENT_SDK\""
echo "Building X86 Client/Dedicated Server against \"$X86_SDK\"" echo "Building X86 Client/Dedicated Server against \"$X86_SDK\""
if [ "$PPC_CLIENT_SDK" != "/Developer/SDKs/MacOSX10.2.8.sdk" ] || \ if [ "$PPC_SDK" != "/Developer/SDKs/MacOSX10.3.9.sdk" ] || \
[ "$PPC_SERVER_SDK" != "/Developer/SDKs/MacOSX10.3.9.sdk" ] || \
[ "$X86_SDK" != "/Developer/SDKs/MacOSX10.4u.sdk" ]; then [ "$X86_SDK" != "/Developer/SDKs/MacOSX10.4u.sdk" ]; then
echo "\ echo "\
WARNING: in order to build a binary with maximum compatibility you must WARNING: in order to build a binary with maximum compatibility you must
build on Mac OS X 10.4 using Xcode 2.3 or 2.5 and have the build on Mac OS X 10.4 using Xcode 2.3 or 2.5 and have the
MacOSX10.2.8, MacOSX10.3.9, and MacOSX10.4u SDKs installed MacOSX10.3.9, and MacOSX10.4u SDKs installed from the Xcode
from the Xcode install disk Packages folder." install disk Packages folder."
fi fi
sleep 3 sleep 3
@ -157,22 +111,11 @@ fi
# For parallel make on multicore boxes... # For parallel make on multicore boxes...
NCPU=`sysctl -n hw.ncpu` NCPU=`sysctl -n hw.ncpu`
# ppc dedicated server # ppc client and server
echo "Building Dedicated Server using $PPC_SERVER_SDK" if [ -d build/release-release-ppc ]; then
sleep 2
if [ -d build/release-darwin-ppc ]; then
rm -r build/release-darwin-ppc rm -r build/release-darwin-ppc
fi fi
(ARCH=ppc BUILD_CLIENT_SMP=0 BUILD_CLIENT=0 BUILD_GAME_VM=0 BUILD_GAME_SO=0 \ (ARCH=ppc CFLAGS=$PPC_CFLAGS LDFLAGS=$PPC_LDFLAGS make -j$NCPU) || exit 1;
CFLAGS=$PPC_SERVER_CFLAGS LDFLAGS=$PPC_SERVER_LDFLAGS make -j$NCPU) || exit 1;
cp build/release-darwin-ppc/ioq3ded.ppc $DESTDIR
# ppc client
if [ -d build/release-darwin-ppc ]; then
rm -r build/release-darwin-ppc
fi
(ARCH=ppc USE_OPENAL_DLOPEN=1 BUILD_SERVER=0 CC=$PPC_CLIENT_CC \
CFLAGS=$PPC_CLIENT_CFLAGS LDFLAGS=$PPC_CLIENT_LDFLAGS make -j$NCPU) || exit 1;
# intel client and server # intel client and server
if [ -d build/release-darwin-i386 ]; then if [ -d build/release-darwin-i386 ]; then
@ -231,7 +174,6 @@ echo "
lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ
lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ
rm $DESTDIR/ioq3ded.ppc
cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/ cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/ cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/ cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/