ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 2723 

* ARCH should be i386 instead of x86 for Mac OS X too
This commit is contained in:
Tony J. White = 2006-08-02 05:12:20 +00:00
parent 9a6fad9cf1
commit fe35a8eef8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -293,7 +293,7 @@ ifeq ($(PLATFORM),darwin)
# the -m linker flag, but you can't shut up the warnings # the -m linker flag, but you can't shut up the warnings
USE_OPENAL_DLOPEN=1 USE_OPENAL_DLOPEN=1
else else
ifeq ($(BUILD_MACOSX_UB),x86) ifeq ($(BUILD_MACOSX_UB),i386)
CC=gcc-4.0 CC=gcc-4.0
BASE_CFLAGS += -arch i386 -DSMP \ BASE_CFLAGS += -arch i386 -DSMP \
-isysroot /Developer/SDKs/MacOSX10.4u.sdk \ -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
@ -304,7 +304,7 @@ ifeq ($(PLATFORM),darwin)
-isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include
LDFLAGS = -mmacosx-version-min=10.4 \ LDFLAGS = -mmacosx-version-min=10.4 \
-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1 -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1
ARCH=x86 ARCH=i386
BUILD_SERVER=0 BUILD_SERVER=0
else else
# for whatever reason using the headers in the MacOSX SDKs tend to throw # for whatever reason using the headers in the MacOSX SDKs tend to throw
@ -321,7 +321,7 @@ ifeq ($(PLATFORM),darwin)
# in the PPC vm (should be a better non-Carbon way). # in the PPC vm (should be a better non-Carbon way).
LDFLAGS += -framework Carbon LDFLAGS += -framework Carbon
endif endif
ifeq ($(ARCH),x86) ifeq ($(ARCH),i386)
OPTIMIZE += -msse2 OPTIMIZE += -msse2
# x86 vm will crash without -mstackrealign since MMX instructions will be # x86 vm will crash without -mstackrealign since MMX instructions will be
# used no matter what and they corrupt the frame pointer in VM calls # used no matter what and they corrupt the frame pointer in VM calls

16
make-macosx-ub.sh
View File

@ -6,23 +6,23 @@ MPACKDIR=missionpack
BIN_OBJ=" BIN_OBJ="
build/release-darwin-ppc/ioquake3.ppc build/release-darwin-ppc/ioquake3.ppc
build/release-darwin-x86/ioquake3.x86 build/release-darwin-i386/ioquake3.i386
" "
BASE_OBJ=" BASE_OBJ="
build/release-darwin-ppc/$BASEDIR/cgameppc.dylib build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
build/release-darwin-x86/$BASEDIR/cgamex86.dylib build/release-darwin-i386/$BASEDIR/cgamei386.dylib
build/release-darwin-ppc/$BASEDIR/uippc.dylib build/release-darwin-ppc/$BASEDIR/uippc.dylib
build/release-darwin-x86/$BASEDIR/uix86.dylib build/release-darwin-i386/$BASEDIR/uii386.dylib
build/release-darwin-ppc/$BASEDIR/qagameppc.dylib build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
build/release-darwin-x86/$BASEDIR/qagamex86.dylib build/release-darwin-i386/$BASEDIR/qagamei386.dylib
" "
MPACK_OBJ=" MPACK_OBJ="
build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
build/release-darwin-x86/$MPACKDIR/cgamex86.dylib build/release-darwin-i386/$MPACKDIR/cgamei386.dylib
build/release-darwin-ppc/$MPACKDIR/uippc.dylib build/release-darwin-ppc/$MPACKDIR/uippc.dylib
build/release-darwin-x86/$MPACKDIR/uix86.dylib build/release-darwin-i386/$MPACKDIR/uii386.dylib
build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
build/release-darwin-x86/$MPACKDIR/qagamex86.dylib build/release-darwin-i386/$MPACKDIR/qagamei386.dylib
" "
if [ ! -f Makefile ]; then 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";
@ -42,7 +42,7 @@ The installer for this SDK is included with XCode 2.2 or newer"
exit 1; exit 1;
fi fi
(BUILD_MACOSX_UB=ppc make && BUILD_MACOSX_UB=x86 make) || exit 1; (BUILD_MACOSX_UB=ppc make && BUILD_MACOSX_UB=i386 make) || exit 1;
if [ ! -d $DESTDIR ]; then if [ ! -d $DESTDIR ]; then
mkdir $DESTDIR || exit 1; mkdir $DESTDIR || exit 1;