diff options
| author | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-12-31 16:11:29 +0000 |
|---|---|---|
| committer | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-12-31 16:11:29 +0000 |
| commit | 5ffa5f47db2992606e451225d0d8be4e262a52c8 (patch) | |
| tree | 110d9966fde4a0d3dac645c949a022f56210be07 | |
| parent | 751919dbe323dfa9d7b7f89cf0f23258ee14f0c6 (diff) | |
| download | ioquake3-aero-5ffa5f47db2992606e451225d0d8be4e262a52c8.tar.gz ioquake3-aero-5ffa5f47db2992606e451225d0d8be4e262a52c8.zip | |
Fix build process on 10.5 and 10.4 sdks for tjw's modifications
git-svn-id: svn://svn.icculus.org/quake3/trunk@1244 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | make-macosx-ub.sh | 14 |
2 files changed, 10 insertions, 10 deletions
@@ -289,12 +289,12 @@ ifeq ($(PLATFORM),darwin) ifeq ($(BUILD_MACOSX_UB),ppc) CC=gcc-4.0 - BASE_CFLAGS += -arch ppc -DSMP \ + BASE_CFLAGS += -arch ppc -mmacosx-version-min=10.4 -DSMP \ -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ -isystem "$(MACOSX_SDK_DIR)"/usr/include - LDFLAGS += -arch ppc \ + LDFLAGS += -arch ppc -mmacosx-version-min=10.4 \ -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -Wl,-syslibroot,"$(MACOSX_SDK_DIR)" @@ -309,7 +309,7 @@ ifeq ($(PLATFORM),darwin) -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ -isystem "$(MACOSX_SDK_DIR)"/usr/include - LDFLAGS = -arch i386 -mmacosx-version-min=10.4 \ + LDFLAGS += -arch i386 -mmacosx-version-min=10.4 \ -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -Wl,-syslibroot,"$(MACOSX_SDK_DIR)" diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh index 44485cd..f580f0f 100755 --- a/make-macosx-ub.sh +++ b/make-macosx-ub.sh @@ -49,9 +49,9 @@ unset PPC_SDK_OPENAL_DLOPEN for availsdks in $(find /Developer/SDKs -type d -maxdepth 1 -mindepth 1 -name "MacOSX*" -exec basename {} \; | sort -r) do case "$availsdks" in - 'MacOSX10.5u.sdk') - PPC_SDK_DIR=/Developer/SDKs/MacOSX10.5u.sdk - X86_SDK_DIR=/Developer/SDKs/MacOSX10.5u.sdk + 'MacOSX10.5.sdk') + PPC_SDK_DIR=/Developer/SDKs/MacOSX10.5.sdk + X86_SDK_DIR=/Developer/SDKs/MacOSX10.5.sdk PPC_SDK_INC=usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include X86_SDK_INC=usr/lib/gcc/i686-apple-darwin9/4.0.1/include PPC_SDK_LIB=usr/lib/gcc/powerpc-apple-darwin9/4.0.1 @@ -61,10 +61,10 @@ do 'MacOSX10.4u.sdk') PPC_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk X86_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk - PPC_SDK_INC=usr/lib/gcc/powerpc-apple-darwin8/4.0.1/include - X86_SDK_INC=usr/lib/gcc/i686-apple-darwin8/4.0.1/include - PPC_SDK_LIB=usr/lib/gcc/powerpc-apple-darwin8/4.0.1 - X86_SDK_LIB=usr/lib/gcc/i686-apple-darwin8/4.0.1 + PPC_SDK_INC=usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include + X86_SDK_INC=usr/lib/gcc/i686-apple-darwin9/4.0.1/include + PPC_SDK_LIB=usr/lib/gcc/powerpc-apple-darwin9/4.0.1 + X86_SDK_LIB=usr/lib/gcc/i686-apple-darwin9/4.0.1 PPC_SDK_OPENAL_DLOPEN=0 ;; 'MacOSX10.3.9.sdk') |