Skip to content

Commit

Permalink
gcc-fat.sh: SDL 1.2 won't build with the Mac OS X 10.11 SDK with < 10…
Browse files Browse the repository at this point in the history 
….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.
  • Loading branch information
@icculus
icculus committed Mar 30, 2016
1 parent 575d9f8 commit 80ae1b4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions build-scripts/g++-fat.sh
View file
Expand Up @@ -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="$*"
Expand Down
14 changes: 7 additions & 7 deletions build-scripts/gcc-fat.sh
View file
Expand Up @@ -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="$*"
Expand Down

0 comments on commit 80ae1b4

Please sign in to comment.