Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 00:47:34 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'osx-macos-27'

Browse Source 
macOS 27 adaptions.

Closes #26578.
This commit is contained in:
Vadim Zeitlin
2026-07-02 23:49:20 +02:00
parent dd5a0cea4f 8a5360b3d0
commit b03b365a17
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/osx/wxcocoa.xcconfig
+1
View File
@@ -5,6 +5,7 @@ WXTOOLKITUPPER = COCOA
MACOSX_DEPLOYMENT_TARGET = 10.10
MACOSX_DEPLOYMENT_TARGET[arch=arm64] = 11.0
MACOSX_DEPLOYMENT_TARGET[sdk=macosx27*] = 12.0
GCC_VERSION =
configure
Vendored
+4 -4
View File
@@ -23083,13 +23083,13 @@ elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
if test "x$wxUSE_MACOSX_SDK" != "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SDK deployment version" >&5
$as_echo_n "checking SDK deployment version... " >&6; }
defaultProperties=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties`
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
MACOSX_SDK_PLIST_VERSION_MIN=`echo "$defaultProperties" | sed -n -e '1,/DEPLOYMENT_TARGET_SUGGESTED_VALUES/d; s/^ *//; s/"//g; s/,//p; q'`
# If that failed, try again with the new key
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
MACOSX_SDK_PLIST_VERSION_MIN=`echo "$defaultProperties" | sed -n -e 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/p'`
fi
configure.ac
+13 -8
View File
@@ -1314,15 +1314,20 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
if test "x$wxUSE_MACOSX_SDK" != "x"; then
AC_MSG_CHECKING([SDK deployment version])
dnl We need to quote the next line where we don't need macros and do need [] in the regex
[
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
]
# If that failed, try again with the new key
defaultProperties=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties`
dnl Take the first (earliest, because they are sorted) supported
dnl deployment target from the SDKSettings.plist file and remove
dnl leading spaces, quotes and trailing comma from it.
MACOSX_SDK_PLIST_VERSION_MIN=`echo "$defaultProperties" | sed -n -e '1,/DEPLOYMENT_TARGET_SUGGESTED_VALUES/d; s/^ *//; s/"//g; s/,//p; q'`
dnl If DEPLOYMENT_TARGET_SUGGESTED_VALUES doesn't exist, as it was in
dnl 10.11..10.13 SDKs, try MACOSX_DEPLOYMENT_TARGET instead.
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
[
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
]
dnl We need to quote the next line where we don't need macros and do need [] in the regex
[
MACOSX_SDK_PLIST_VERSION_MIN=`echo "$defaultProperties" | sed -n -e 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/p'`
]
fi
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then