comparison build-scripts/fatbuild.sh @ 3629:102be1cdd2bb

Merge r5179:5180 from branches/SDL-1.2: fatbuild.sh Xcode 3.2 fix.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 08:15:25 +0000
parents 72a1c4dda07c
children 455c0dad84df
comparison
equal deleted inserted replaced
3628:4d46850be3f6 3629:102be1cdd2bb
61 # Intel 32-bit configure flags (10.4 runtime compatibility) 61 # Intel 32-bit configure flags (10.4 runtime compatibility)
62 # We dynamically load X11, so using the system X11 headers is fine. 62 # We dynamically load X11, so using the system X11 headers is fine.
63 CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \ 63 CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
64 --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" 64 --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
65 65
66 # They changed this to "darwin10" in Xcode 3.2 (Snow Leopard).
67 GCCUSRPATH_X86="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin9/4.0.1"
68 if [ ! -d "$GCCUSRPATH" ]; then
69 GCCUSRPATH_X86="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1"
70 fi
71 if [ ! -d "$GCCUSRPATH_X86" ]; then
72 echo "Couldn't find any GCC usr path for x86"
73 exit 1
74 fi
75
66 # Intel 32-bit compiler flags 76 # Intel 32-bit compiler flags
67 CC_X86="gcc-4.0 -arch i386" 77 CC_X86="gcc-4.0 -arch i386"
68 CXX_X86="g++-4.0 -arch i386" 78 CXX_X86="g++-4.0 -arch i386"
69 CFLAGS_X86="-mmacosx-version-min=10.4" 79 CFLAGS_X86="-mmacosx-version-min=10.4"
70 CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ 80 CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
71 -nostdinc \ 81 -nostdinc \
72 -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \ 82 -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
73 -I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \ 83 -I$GCCUSRPATH_X86/include \
74 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include" 84 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
75 85
76 # Intel 32-bit linker flags 86 # Intel 32-bit linker flags
77 LFLAGS_X86="-arch i386 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.4 \ 87 LFLAGS_X86="-arch i386 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.4 \
78 -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \ 88 -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
79 -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1 \ 89 -L$GCCUSRPATH_X86 \
80 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" 90 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
81 91
82 # Intel 64-bit configure flags (10.5 runtime compatibility) 92 # Intel 64-bit configure flags (10.5 runtime compatibility)
83 # We dynamically load X11, so using the system X11 headers is fine. 93 # We dynamically load X11, so using the system X11 headers is fine.
84 CONFIG_X64="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \ 94 CONFIG_X64="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \