Make build-scripts/fatbuild.sh sane for x86-64. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Fri, 16 Sep 2011 00:46:59 -0400
branchSDL-1.2
changeset 5944f5c4ce6a2f67
parent 5943 b442dbd2b6be
child 5945 3868f2e09b12
Make build-scripts/fatbuild.sh sane for x86-64.

No one targets 10.5 or uses gcc 4.0 with x86-64 Mac OS X.
build-scripts/fatbuild.sh
     1.1 --- a/build-scripts/fatbuild.sh	Fri Sep 16 00:11:23 2011 -0400
     1.2 +++ b/build-scripts/fatbuild.sh	Fri Sep 16 00:46:59 2011 -0400
     1.3 @@ -27,7 +27,7 @@
     1.4      echo "Couldn't find any GCC usr path for 32-bit x86"
     1.5      exit 1
     1.6  fi
     1.7 -GCCUSRPATH_X64=`ls -d $SDK_PATH/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin*/4.0.1`
     1.8 +GCCUSRPATH_X64=`ls -d $SDK_PATH/MacOSX10.6.sdk/usr/lib/gcc/i686-apple-darwin*/4.2.1`
     1.9  if [ ! -d "$GCCUSRPATH_X64" ]; then
    1.10      echo "Couldn't find any GCC usr path for 64-bit x86"
    1.11      exit 1
    1.12 @@ -49,26 +49,26 @@
    1.13  -L$GCCUSRPATH_X86 \
    1.14  -Wl,-syslibroot,$SDK_PATH/MacOSX10.4u.sdk"
    1.15  
    1.16 -# Intel 64-bit configure flags (10.5 runtime compatibility)
    1.17 +# Intel 64-bit configure flags (10.6 runtime compatibility)
    1.18  # We dynamically load X11, so using the system X11 headers is fine.
    1.19  CONFIG_X64="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
    1.20  --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
    1.21  
    1.22  # Intel 64-bit compiler flags
    1.23 -CC_X64="gcc-4.0 -arch x86_64"
    1.24 -CXX_X64="g++-4.0 -arch x86_64"
    1.25 -CFLAGS_X64="-mmacosx-version-min=10.5"
    1.26 -CPPFLAGS_X64="-DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \
    1.27 +CC_X64="gcc-4.2 -arch x86_64"
    1.28 +CXX_X64="g++-4.2 -arch x86_64"
    1.29 +CFLAGS_X64="-mmacosx-version-min=10.6"
    1.30 +CPPFLAGS_X64="-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
    1.31  -nostdinc \
    1.32 --F$SDK_PATH/MacOSX10.5.sdk/System/Library/Frameworks \
    1.33 +-F$SDK_PATH/MacOSX10.6.sdk/System/Library/Frameworks \
    1.34  -I$GCCUSRPATH_X64/include \
    1.35 --isystem $SDK_PATH/MacOSX10.5.sdk/usr/include"
    1.36 +-isystem $SDK_PATH/MacOSX10.6.sdk/usr/include"
    1.37  
    1.38  # Intel 64-bit linker flags
    1.39 -LFLAGS_X64="-arch x86_64 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.5 \
    1.40 --F$SDK_PATH/MacOSX10.5.sdk/System/Library/Frameworks \
    1.41 +LFLAGS_X64="-arch x86_64 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.6 \
    1.42 +-F$SDK_PATH/MacOSX10.6.sdk/System/Library/Frameworks \
    1.43  -L$GCCUSRPATH_X64/x86_64 \
    1.44 --Wl,-syslibroot,$SDK_PATH/MacOSX10.5.sdk"
    1.45 +-Wl,-syslibroot,$SDK_PATH/MacOSX10.6.sdk"
    1.46  
    1.47  #
    1.48  # Find the configure script