Merge r5179:5180 from branches/SDL-1.2: fatbuild.sh Xcode 3.2 fix.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 10 Jan 2010 08:15:25 +0000
changeset 3629102be1cdd2bb
parent 3628 4d46850be3f6
child 3630 efb79807afe1
Merge r5179:5180 from branches/SDL-1.2: fatbuild.sh Xcode 3.2 fix.
build-scripts/fatbuild.sh
     1.1 --- a/build-scripts/fatbuild.sh	Sun Jan 10 07:48:14 2010 +0000
     1.2 +++ b/build-scripts/fatbuild.sh	Sun Jan 10 08:15:25 2010 +0000
     1.3 @@ -63,6 +63,16 @@
     1.4  CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
     1.5  --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
     1.6  
     1.7 +# They changed this to "darwin10" in Xcode 3.2 (Snow Leopard).
     1.8 +GCCUSRPATH_X86="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin9/4.0.1"
     1.9 +if [ ! -d "$GCCUSRPATH" ]; then
    1.10 +    GCCUSRPATH_X86="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1"
    1.11 +fi
    1.12 +if [ ! -d "$GCCUSRPATH_X86" ]; then
    1.13 +    echo "Couldn't find any GCC usr path for x86"
    1.14 +    exit 1
    1.15 +fi
    1.16 +
    1.17  # Intel 32-bit compiler flags
    1.18  CC_X86="gcc-4.0 -arch i386"
    1.19  CXX_X86="g++-4.0 -arch i386"
    1.20 @@ -70,13 +80,13 @@
    1.21  CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
    1.22  -nostdinc \
    1.23  -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
    1.24 --I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \
    1.25 +-I$GCCUSRPATH_X86/include \
    1.26  -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
    1.27  
    1.28  # Intel 32-bit linker flags
    1.29  LFLAGS_X86="-arch i386 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.4 \
    1.30  -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
    1.31 --L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1 \
    1.32 +-L$GCCUSRPATH_X86 \
    1.33  -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
    1.34  
    1.35  # Intel 64-bit configure flags (10.5 runtime compatibility)