Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check minimum macOS version in configure too

Browse Source 
Targeting anything less than 10.10 is not supported any longer, so check
for this and also update --with-macosx-version-min description in help
to mention it.
This commit is contained in:
Vadim Zeitlin
2020-07-05 19:34:27 +02:00
parent a4f9e207dc
commit 94fc2ca6d8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -2341,7 +2341,7 @@ Optional Packages:
--with-zlib use zlib for LZW compression --with-zlib use zlib for LZW compression
--with-expat enable XML support using expat parser --with-expat enable XML support using expat parser
--with-macosx-sdk=PATH use an OS X SDK at PATH --with-macosx-sdk=PATH use an OS X SDK at PATH
--with-macosx-version-min=VER build binaries which require at least this OS X version --with-macosx-version-min=VER build binaries which require at least this OS X version (default and lowest supported: 10.10)
--with-cxx=11|14|17 use the given C++ dialect --with-cxx=11|14|17 use the given C++ dialect
--with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-prefix=PFX Prefix where GTK is installed (optional)
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
@@ -18786,8 +18786,10 @@ int
main () main ()
{ {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
#else #error macOS versions < 10.10 are not supported.
#endif
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
#error macOS SDK version is too low, 10.11 or later is required. #error macOS SDK version is too low, 10.11 or later is required.
#endif #endif

8
configure.in
View File

@@ -582,7 +582,7 @@ AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=PATH use an OS X SDK at PATH],
wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
]) ])
AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version], [ AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version (default and lowest supported: 10.10)], [
wxUSE_MACOSX_VERSION_MIN=$withval wxUSE_MACOSX_VERSION_MIN=$withval
wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
]) ])
@@ -1369,8 +1369,10 @@ version or omitting it entirely."
#include <Availability.h> #include <Availability.h>
], ],
[ [
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
#else #error macOS versions < 10.10 are not supported.
#endif
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
#error macOS SDK version is too low, 10.11 or later is required. #error macOS SDK version is too low, 10.11 or later is required.
#endif #endif
], ],