From d35c737f1c8ba4d28c3d45c557961b3ddce9bef0 Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <[EMAIL REDACTED]>
Date: Sat, 7 May 2022 21:38:48 -0300
Subject: [PATCH] macOS: change min supported OS from 10.6 to 10.7.
---
Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++--
Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj | 4 ++--
Xcode/SDLTest/TestDropFile-Info.plist | 2 +-
build-scripts/clang++-fat.sh | 6 +++---
build-scripts/clang-fat.sh | 8 ++++----
docs/README-macos.md | 11 +++++------
include/SDL_platform.h | 6 +++---
7 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index efdc40cdfda..9f39ca64849 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -9237,7 +9237,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2;
PRODUCT_NAME = SDL2;
STRIP_STYLE = "non-global";
@@ -9321,7 +9321,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2;
PRODUCT_NAME = SDL2;
diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
index 8c524cc54e7..72e2c53080a 100644
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -4048,7 +4048,7 @@
);
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = ../../include;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Debug;
};
@@ -4175,7 +4175,7 @@
);
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
HEADER_SEARCH_PATHS = ../../include;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Release;
};
diff --git a/Xcode/SDLTest/TestDropFile-Info.plist b/Xcode/SDLTest/TestDropFile-Info.plist
index 03e46b33bc2..c9f6cb835fe 100644
--- a/Xcode/SDLTest/TestDropFile-Info.plist
+++ b/Xcode/SDLTest/TestDropFile-Info.plist
@@ -30,6 +30,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
- <string>10.6</string>
+ <string>10.7</string>
</dict>
</plist>
diff --git a/build-scripts/clang++-fat.sh b/build-scripts/clang++-fat.sh
index d337109f91e..41fdf1c337d 100755
--- a/build-scripts/clang++-fat.sh
+++ b/build-scripts/clang++-fat.sh
@@ -6,11 +6,11 @@
DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer"
-# Intel 64-bit compiler flags (10.6 runtime compatibility)
-CLANG_COMPILE_X64="clang++ -arch x86_64 -mmacosx-version-min=10.6 \
+# Intel 64-bit compiler flags (10.7 runtime compatibility)
+CLANG_COMPILE_X64="clang++ -arch x86_64 -mmacosx-version-min=10.7 \
-I/usr/local/include"
-CLANG_LINK_X64="-mmacosx-version-min=10.6"
+CLANG_LINK_X64="-mmacosx-version-min=10.7"
# ARM 64-bit compiler flags (11.0 runtime compatibility)
CLANG_COMPILE_ARM64="clang++ -arch arm64 -mmacosx-version-min=11.0 \
diff --git a/build-scripts/clang-fat.sh b/build-scripts/clang-fat.sh
index 38c07275de7..4d1d30a6feb 100755
--- a/build-scripts/clang-fat.sh
+++ b/build-scripts/clang-fat.sh
@@ -6,12 +6,12 @@
DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer"
-# Intel 64-bit compiler flags (10.6 runtime compatibility)
-CLANG_COMPILE_X64="clang -arch x86_64 -mmacosx-version-min=10.6 \
--DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
+# Intel 64-bit compiler flags (10.7 runtime compatibility)
+CLANG_COMPILE_X64="clang -arch x86_64 -mmacosx-version-min=10.7 \
+-DMAC_OS_X_VERSION_MIN_REQUIRED=1070 \
-I/usr/local/include"
-CLANG_LINK_X64="-mmacosx-version-min=10.6"
+CLANG_LINK_X64="-mmacosx-version-min=10.7"
# ARM 64-bit compiler flags (11.0 runtime compatibility)
CLANG_COMPILE_ARM64="clang -arch arm64 -mmacosx-version-min=11.0 \
diff --git a/docs/README-macos.md b/docs/README-macos.md
index 9d2c6a921aa..91987ade2ba 100644
--- a/docs/README-macos.md
+++ b/docs/README-macos.md
@@ -43,15 +43,14 @@ make
sudo make install
-This script builds SDL with 10.6 ABI compatibility on 64-bit Intel and 11.0
+This script builds SDL with 10.7 ABI compatibility on 64-bit Intel and 11.0
ABI compatibility on ARM64 architectures. For best compatibility you
should compile your application the same way.
-Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK
-(even if you target back to 10.6 systems). PowerPC support for Mac OS X has
-been officially dropped as of SDL 2.0.2. 32-bit Intel, using an older Xcode
-release, is still supported at the time of this writing, but current Xcode
-releases no longer support it, and eventually neither will SDL.
+Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK.
+PowerPC support for macOS has been officially dropped as of SDL 2.0.2.
+32-bit Intel and macOS 10.6 runtime support has been officially dropped as
+of SDL 2.24.0.
To use the library once it’s built, you essential have two possibilities:
use the traditional autoconf/automake/make method, or use Xcode.
diff --git a/include/SDL_platform.h b/include/SDL_platform.h
index 2663e143efc…c0bccb093de 100644
— a/include/SDL_platform.h
+++ b/include/SDL_platform.h
@@ -108,9 +108,9 @@
/* if not compiling for iOS /
#undef MACOSX
#define MACOSX 1
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-# error SDL for Mac OS X only supports deploying on 10.6 and above.
-#endif / MAC_OS_X_VERSION_MIN_REQUIRED < 1060 /
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
+# error SDL for Mac OS X only supports deploying on 10.7 and above.
+#endif / MAC_OS_X_VERSION_MIN_REQUIRED < 1070 /
#endif / TARGET_OS_IPHONE /
#endif / defined(APPLE) */