From a12a4c25bce29bca126956df9e48dd0aab7f039b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 6 Jun 2017 21:54:08 +0200 Subject: [PATCH] support Xcode 9 and 10.13 SDK builds --- include/wx/platform.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/include/wx/platform.h b/include/wx/platform.h index 5649c78944..2f5dea1d99 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -44,11 +44,16 @@ # ifndef MAC_OS_X_VERSION_10_12 # define MAC_OS_X_VERSION_10_12 101200 # endif -# ifndef NSAppKitVersionNumber10_10 -# define NSAppKitVersionNumber10_10 1343 +# ifndef MAC_OS_X_VERSION_10_13 +# define MAC_OS_X_VERSION_10_13 101300 # endif -# ifndef NSAppKitVersionNumber10_11 -# define NSAppKitVersionNumber10_11 1404 +# if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 +# ifndef NSAppKitVersionNumber10_10 +# define NSAppKitVersionNumber10_10 1343 +# endif +# ifndef NSAppKitVersionNumber10_11 +# define NSAppKitVersionNumber10_11 1404 +# endif # endif # include "wx/osx/config_xcode.h" # ifndef __WXOSX__ @@ -484,11 +489,16 @@ # ifndef MAC_OS_X_VERSION_10_12 # define MAC_OS_X_VERSION_10_12 101200 # endif -# ifndef NSAppKitVersionNumber10_10 -# define NSAppKitVersionNumber10_10 1343 +# ifndef MAC_OS_X_VERSION_10_13 +# define MAC_OS_X_VERSION_10_13 101300 # endif -# ifndef NSAppKitVersionNumber10_11 -# define NSAppKitVersionNumber10_11 1404 +# if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 +# ifndef NSAppKitVersionNumber10_10 +# define NSAppKitVersionNumber10_10 1343 +# endif +# ifndef NSAppKitVersionNumber10_11 +# define NSAppKitVersionNumber10_11 1404 +# endif # endif # else # error "only mach-o configurations are supported"