diff options
| author | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-07-20 17:42:34 +0000 |
|---|---|---|
| committer | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-07-20 17:42:34 +0000 |
| commit | ae6f1c7f5d75be89cb177c114fb184f0ed34ef6e (patch) | |
| tree | a6160715143e1b422a7a996a5951fce29ef79f64 /make-macosx-ub.sh | |
| parent | b9ad917c3a926923bb43ea444a4b968960071307 (diff) | |
| download | ioquake3-aero-ae6f1c7f5d75be89cb177c114fb184f0ed34ef6e.tar.gz ioquake3-aero-ae6f1c7f5d75be89cb177c114fb184f0ed34ef6e.zip | |
Bug 3726
make-macosx-ub.sh error aborting and directory changing
Thanks to Ben Millwood.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1430 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'make-macosx-ub.sh')
| -rwxr-xr-x | make-macosx-ub.sh | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh index f612281..935d0cc 100755 --- a/make-macosx-ub.sh +++ b/make-macosx-ub.sh @@ -7,7 +7,6 @@ ICNS=misc/quake3.icns DESTDIR=build/release-darwin-ub BASEDIR=baseq3 MPACKDIR=missionpack -Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'` BIN_OBJ=" build/release-darwin-ppc/ioquake3-smp.ppc @@ -33,10 +32,15 @@ MPACK_OBJ=" build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib build/release-darwin-i386/$MPACKDIR/qagamei386.dylib " + +cd `dirname $0` if [ ! -f Makefile ]; then - echo "This script must be run from the ioquake3 build directory"; + echo "This script must be run from the ioquake3 build directory" + exit 1 fi +Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'` + # We only care if we're >= 10.4, not if we're specifically Tiger. # "8" is the Darwin major kernel version. #TIGERHOST=`uname -r | grep ^8.` @@ -123,6 +127,15 @@ if [ -d /Developer/SDKs/MacOSX10.2.8.sdk ] && [ -x /usr/bin/gcc-3.3 ] && [ $TIGE -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk,-m" fi +if [ -z $PPC_CLIENT_SDK ] || [ -z $PPC_SERVER_SDK ] || [ -z $X86_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' instead of this script." + exit 1 +fi + echo "Building PPC Dedicated Server against \"$PPC_SERVER_SDK\"" echo "Building PPC Client against \"$PPC_CLIENT_SDK\"" echo "Building X86 Client/Dedicated Server against \"$X86_SDK\"" @@ -135,15 +148,6 @@ WARNING: in order to build a binary with maximum compatibility you must MacOSX10.2.8, MacOSX10.3.9, and MacOSX10.4u SDKs installed from the Xcode install disk Packages folder." fi - -if [ -z $PPC_CLIENT_SDK ] || [ -z $PPC_SERVER_SDK ] || [ -z $X86_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' instead of this script." - exit 1 -fi sleep 3 if [ ! -d $DESTDIR ]; then |