okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 2723

Browse source 
* adds a shell script ./make-macosx-ub.sh that builds Mac OS X Universal Binary
* fixes Mac OS X x86 VM crashes (-mstackrealign)
* adds current working directory to the search path on Mac OS X to make
  working with .app bundles easier
* various tweaks to make ioquake3 build against the 10.2 SDK 
* changed default OpenAL .dylib location to the path of the one included with
  the Framework bundled in 10.4 (for USE_OPENAL_DLOPEN)
* updated to a Universal libSDL-1.2.0.dylib
This commit is contained in:
Tony J. White = 2006-08-02 04:01:36 +00:00
parent 7cb5edc9ed
commit 9a6fad9cf1
7 changed files with 165 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

62
make-macosx-ub.sh Executable file
View file

@ -0,0 +1,62 @@
#!/bin/sh
DESTDIR=build/release-darwin-ub
BASEDIR=baseq3
MPACKDIR=missionpack
BIN_OBJ="
build/release-darwin-ppc/ioquake3.ppc
build/release-darwin-x86/ioquake3.x86
"
BASE_OBJ="
build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
build/release-darwin-x86/$BASEDIR/cgamex86.dylib
build/release-darwin-ppc/$BASEDIR/uippc.dylib
build/release-darwin-x86/$BASEDIR/uix86.dylib
build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
build/release-darwin-x86/$BASEDIR/qagamex86.dylib
"
MPACK_OBJ="
build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
build/release-darwin-x86/$MPACKDIR/cgamex86.dylib
build/release-darwin-ppc/$MPACKDIR/uippc.dylib
build/release-darwin-x86/$MPACKDIR/uix86.dylib
build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
build/release-darwin-x86/$MPACKDIR/qagamex86.dylib
"
if [ ! -f Makefile ]; then
echo "This script must be run from the ioquake3 build directory";
fi
if [ ! -d /Developer/SDKs/MacOSX10.2.8.sdk ]; then
echo "
/Developer/SDKs/MacOSX10.2.8.sdk/ is missing.
The installer for this SDK is included with XCode 2.2 or newer"
exit 1;
fi
if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
echo "
/Developer/SDKs/MacOSX10.4u.sdk/ is missing.
The installer for this SDK is included with XCode 2.2 or newer"
exit 1;
fi
(BUILD_MACOSX_UB=ppc make && BUILD_MACOSX_UB=x86 make) || exit 1;
if [ ! -d $DESTDIR ]; then
mkdir $DESTDIR || exit 1;
fi
if [ ! -d $DESTDIR/$BASEDIR ]; then
mkdir $DESTDIR/$BASEDIR || exit 1;
fi
if [ ! -d $DESTDIR/$MPACKDIR ]; then
mkdir $DESTDIR/$MPACKDIR || exit 1;
fi
echo "Installing Universal Binaries in $DESTDIR"
lipo -create -o $DESTDIR/ioquake3.ub $BIN_OBJ
cp $BASE_OBJ $DESTDIR/$BASEDIR/
cp $MPACK_OBJ $DESTDIR/$MPACKDIR/
cp code/libs/macosx/*.dylib $DESTDIR/