Merge branch 'update-xcode-builds' of https://github.com/discnl/wxWidgets

Update Xcode projects to correspond to the latest makefiles and use ARM
architecture instead of i386.

See https://github.com/wxWidgets/wxWidgets/pull/2484

build/osx/wx.xcconfig

@@ -10,8 +10,8 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 
 GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
 GCC_PRECOMPILE_PREFIX_HEADER = YES
-HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex"
+HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex" "$(WXROOT)/3rdparty/pcre/src/wx"
-USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" "$(WXROOT)/3rdparty/pcre/src/wx"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
 ALWAYS_SEARCH_USER_PATHS = NO
 WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 HAVE_CONFIG_H PNG_NO_CONFIG_H
 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS)

build/osx/wxcocoa.xcconfig

@@ -4,9 +4,17 @@ WXTOOLKITUPPER = COCOA
 #include "wx.xcconfig"
 
 MACOSX_DEPLOYMENT_TARGET = 10.10
+MACOSX_DEPLOYMENT_TARGET[arch=arm64] = 11.0
 
 GCC_VERSION =
 
-ARCHS = i386 x86_64
+// Set ARCHS explicitly for when Xcode stops targeting x86_64 by default.
+// Unknown targets are ignored by Xcode (arm64 requires Xcode 12 or later).
+ARCHS = x86_64 arm64
+
+// Using i386 as a target results in a deprecation error since Xcode 10 (first
+// a warning in 9). If Xcode 9 or earlier is used and the i386 target is also
+// needed, one solution is to enable the following line locally.
+//ARCHS = i386 x86_64
 
 OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework AVFoundation -framework CoreMedia -framework Security -framework QuartzCore -weak_framework AVKit

docs/changes.txt

@@ -182,6 +182,10 @@ Changes in behaviour which may result in build errors
 - Under macOS, 10.11 SDK is the minimum SDK, building and deploying under 10.10.5 and
   higher is supported, you must use at least Xcode 7.2.1.
 
+- wxOSX Xcode projects no longer include the i386 target by default and,
+  with Xcode 12 or later, build for the arm64 architecture in addition to
+  existing x86_64. See build/osx/wxcocoa.xcconfig for more information.
+
 - wxPGProperty ctors are not longer public since this class is intended to be
   a base class and should not be instantiated directly.
 

samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj

@@ -283,7 +283,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
 				PRODUCT_NAME = minimal_cocoa;
 				USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include";
 			};

samples/minimal/minimal_iphone.xcodeproj/project.pbxproj

@@ -205,8 +205,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
-				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = minimal_iphone;
 			};
 			name = Debug;
@@ -215,7 +213,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				PRODUCT_NAME = minimal_iphone;
 			};
 			name = Release;