From 80ae1b4f5c1aebbce90523bbaf89b54bf65d274c Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 30 Mar 2016 13:30:19 -0400 Subject: [PATCH] gcc-fat.sh: SDL 1.2 won't build with the Mac OS X 10.11 SDK with < 10.7 compat. Several deprecated APIs it uses are flat-out removed from the SDK now. We already had preprocessor checks around them, so gcc-fat.sh just needs its minimum OS compatibility bumped up to 10.7. Leaving the deprecated code in place, however, in case someone wants to target an ancient OS X by compiling with an older SDK. --- build-scripts/g++-fat.sh | 12 ++++++------ build-scripts/gcc-fat.sh | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build-scripts/g++-fat.sh b/build-scripts/g++-fat.sh index 6e4f53e7c..fe2be803b 100755 --- a/build-scripts/g++-fat.sh +++ b/build-scripts/g++-fat.sh @@ -6,17 +6,17 @@ DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer" -# Intel 32-bit compiler flags (10.6 runtime compatibility) -GCC_COMPILE_X86="g++ -arch i386 -mmacosx-version-min=10.5 \ +# Intel 32-bit compiler flags (10.7 runtime compatibility) +GCC_COMPILE_X86="g++ -arch i386 -mmacosx-version-min=10.7 \ -I/usr/local/include" -GCC_LINK_X86="-mmacosx-version-min=10.5" +GCC_LINK_X86="-mmacosx-version-min=10.7" -# Intel 64-bit compiler flags (10.6 runtime compatibility) -GCC_COMPILE_X64="g++ -arch x86_64 -mmacosx-version-min=10.6 \ +# Intel 64-bit compiler flags (10.7 runtime compatibility) +GCC_COMPILE_X64="g++ -arch x86_64 -mmacosx-version-min=10.7 \ -I/usr/local/include" -GCC_LINK_X64="-mmacosx-version-min=10.6" +GCC_LINK_X64="-mmacosx-version-min=10.7" # Output both PowerPC and Intel object files args="$*" diff --git a/build-scripts/gcc-fat.sh b/build-scripts/gcc-fat.sh index edabb0d87..e87a2bc04 100755 --- a/build-scripts/gcc-fat.sh +++ b/build-scripts/gcc-fat.sh @@ -6,18 +6,18 @@ DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer" -# Intel 32-bit compiler flags (10.5 runtime compatibility) -GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.5 \ +# Intel 32-bit compiler flags (10.7 runtime compatibility) +GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.7 \ -I/usr/local/include" -GCC_LINK_X86="-mmacosx-version-min=10.5" +GCC_LINK_X86="-mmacosx-version-min=10.7" -# Intel 64-bit compiler flags (10.6 runtime compatibility) -GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.6 \ --DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ +# Intel 64-bit compiler flags (10.7 runtime compatibility) +GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.7 \ +-DMAC_OS_X_VERSION_MIN_REQUIRED=1070 \ -I/usr/local/include" -GCC_LINK_X64="-mmacosx-version-min=10.6" +GCC_LINK_X64="-mmacosx-version-min=10.7" # Output both PowerPC and Intel object files args="$*"