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

Fix build process on 10.5 and 10.4 sdks for tjw's modifications

This commit is contained in:
Thilo Schulz 2007-12-31 16:11:29 +00:00
parent 2d32d3dbff
commit 45698be226
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -289,12 +289,12 @@ ifeq ($(PLATFORM),darwin)
ifeq ($(BUILD_MACOSX_UB),ppc) ifeq ($(BUILD_MACOSX_UB),ppc)
CC=gcc-4.0 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 \ -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc \
-F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \
-I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \
-isystem "$(MACOSX_SDK_DIR)"/usr/include -isystem "$(MACOSX_SDK_DIR)"/usr/include
LDFLAGS += -arch ppc \ LDFLAGS += -arch ppc -mmacosx-version-min=10.4 \
-L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \ -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \
-F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \
-Wl,-syslibroot,"$(MACOSX_SDK_DIR)" -Wl,-syslibroot,"$(MACOSX_SDK_DIR)"
@ -309,7 +309,7 @@ ifeq ($(PLATFORM),darwin)
-F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \
-I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \
-isystem "$(MACOSX_SDK_DIR)"/usr/include -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)" \ -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \
-F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \
-Wl,-syslibroot,"$(MACOSX_SDK_DIR)" -Wl,-syslibroot,"$(MACOSX_SDK_DIR)"

14
make-macosx-ub.sh
View File

@ -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) for availsdks in $(find /Developer/SDKs -type d -maxdepth 1 -mindepth 1 -name "MacOSX*" -exec basename {} \; | sort -r)
do do
case "$availsdks" in case "$availsdks" in
'MacOSX10.5u.sdk') 'MacOSX10.5.sdk')
PPC_SDK_DIR=/Developer/SDKs/MacOSX10.5u.sdk PPC_SDK_DIR=/Developer/SDKs/MacOSX10.5.sdk
X86_SDK_DIR=/Developer/SDKs/MacOSX10.5u.sdk X86_SDK_DIR=/Developer/SDKs/MacOSX10.5.sdk
PPC_SDK_INC=usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include 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 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 PPC_SDK_LIB=usr/lib/gcc/powerpc-apple-darwin9/4.0.1
@ -61,10 +61,10 @@ do
'MacOSX10.4u.sdk') 'MacOSX10.4u.sdk')
PPC_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk PPC_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
X86_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 PPC_SDK_INC=usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include
X86_SDK_INC=usr/lib/gcc/i686-apple-darwin8/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-darwin8/4.0.1 PPC_SDK_LIB=usr/lib/gcc/powerpc-apple-darwin9/4.0.1
X86_SDK_LIB=usr/lib/gcc/i686-apple-darwin8/4.0.1 X86_SDK_LIB=usr/lib/gcc/i686-apple-darwin9/4.0.1
PPC_SDK_OPENAL_DLOPEN=0 PPC_SDK_OPENAL_DLOPEN=0
;; ;;
'MacOSX10.3.9.sdk') 'MacOSX10.3.9.sdk')