Merge branch 'master' of https://github.com/adapt-it/adaptit

.gitignore

@@ -9,7 +9,7 @@
 *.rtf#
 *.gmo
 *.pot
-/bin/win32/Unicode Debug/
+x/bin/win32/Unicode Debug/
 /bin/win32/Unicode Release/
 /bin/win32/Debug/
 /bin/win32/Adapt_It.depend
@@ -59,3 +59,6 @@
 /setup Git/Git_Downloader_2_12_1_4AI.exe
 /bin/win32/Adapt_It.aps
 /setup Git/Git_Downloader_2_18_0_4AI.exe
+.DS_Store
+.DS_Store
+.DS_Store

bin/mac/AdaptIt.xcodeproj/project.pbxproj

@@ -1242,8 +1242,8 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				ONLY_ACTIVE_ARCH = YES;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				SDKROOT = "";
 				USER_HEADER_SEARCH_PATHS = "$(inherited)";
@@ -1263,7 +1263,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.10.7;
+				CURRENT_PROJECT_VERSION = 6.11.1;
 				DEVELOPMENT_TEAM = C5GMB572MV;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -1296,9 +1296,9 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = "$(WXWIN)/build/osx/build/Debug";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 6.10.7;
-				ONLY_ACTIVE_ARCH = YES;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 6.11.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -1313,9 +1313,8 @@
 				PRODUCT_NAME = "Adapt It";
 				PRODUCT_NAME_NO_SPACE = AdaptIt;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SDKROOT = "";
+				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "$(WXWIN)/build/osx/setup/cocoa/include ${BOOST_ROOT} ${WXWIN}/include .";
-				VALID_ARCHS = "x86_64 i386";
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
@@ -1361,7 +1360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				SDKROOT = "";
 				WARNING_CFLAGS = "";
 			};
@@ -1378,7 +1377,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
-				CURRENT_PROJECT_VERSION = 6.10.7;
+				CURRENT_PROJECT_VERSION = 6.11.1;
 				DEVELOPMENT_TEAM = C5GMB572MV;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -1411,9 +1410,9 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = "$(WXWIN)/build/osx/build/Release";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 6.10.7;
-				ONLY_ACTIVE_ARCH = YES;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 6.11.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -1428,9 +1427,8 @@
 				PRODUCT_NAME = "Adapt It";
 				PRODUCT_NAME_NO_SPACE = AdaptIt;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SDKROOT = "";
+				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "$(WXWIN)/build/osx/setup/cocoa/include ${BOOST_ROOT} ${WXWIN}/include .";
-				VALID_ARCHS = "x86_64 i386";
 				VERSIONING_SYSTEM = "apple-generic";
 				WARNING_CFLAGS = (
 					"-Wmost",

platform_setup_docs/macos setup.md

@@ -1,6 +1,6 @@
 # Adapt It setup
 
-These are a couple other setup-related items I've run across with macOS. 
+These are a couple other setup-related items I've run across with macOS. This file is meant to supplement the "Setting up Adapt It on OS X..." files, which are a bit of a mess right now (mostly because an errant edit of mine clipped out the back half of the file). Your mileage may vary.
 
 ## Suppress debug asserts in Release mode
 
@@ -15,6 +15,26 @@ We have to make one change to the wxWidgets library source before building; the
     //  #define wxDEBUG_LEVEL 2
     #endif
 
+## Set the xcode build path
+
+We’re using a static build of wxWidgets for osx. Part of this setup requires a known path for the library when built -- a configuration that Apple deems "legacy" these days. 
+
+1. Open Xcode’s Settings > Locations tab, and click the Advanced button. 
+2. In the popup that appears, select the Legacy radio button.
+
+*Side note:* I’ve needed to jump back and forth between the legacy build location and the default one when moving from Adapt It and Adapt It Mobile, respectively. You'll likely only need to do this if you've got other/newer apps you support along with Adapt It.
+
+## Build wxwidgets
+
+As of May 2022 / wxWidgets 3.1.6 / Adapt It 6.10.7, we want to build for both Intel (x64) and Mac Silicon:
+
+1. Open wxcocoa.xcodeproj and select the wxcocoa project>static target.
+2. From the build path / configuration bar, select static > Any Mac (Intel, Apple Silicon).
+3. Select the Project > Build For > Running menu command to build the debug version.
+4. Select the Project > Build For > Profileing menu command to build the release version. 
+
+If all goes well, the builds will succeed and end up in the osx>build>Debug and osx>build>Release subdirectories, respectively, as the file `libwx_osx_cocoa.static.a`.
+
 ## Environment variables
 
 Setting the environment variables properly is a perennial topic in Adapt It's macOS port discussions. Apple has changed how this is done several times over the years, causing no end of hair-pulling and "how do I do this now?" conversations.
@@ -76,16 +96,6 @@ As of May 2022, there are two pieces needed to get a good build from _both_ the
     </dict>
     </plist>
 
-
-## Setting the wxwidgets build path 
-
-We’re using a static build of wxWidgets for osx. Part of this setup requires a known path for the library when built -- a configuration that Apple deems "legacy" these days. 
-
-1. Open Xcode’s Settings > Locations tab, and click the Advanced button. 
-2. In the popup that appears, select the Legacy radio button.
-
-*Side note:* I’ve needed to jump back and forth between the legacy build location and the default one when moving from Adapt It and Adapt It Mobile, respectively. You'll likely only need to do this if you've got other/newer apps you support along with Adapt It.
-
 ## Command line build / archive
 
 Provided you’ve got the command line tools for Xcode installed (the command line should prompt to install if not), you can build from the command line using the following commands: