Update code base to Xcode 12.3 + Universal application

atari800-MacOSX/src/Atari800MacX/Atari800MacX.xcodeproj/project.pbxproj

@@ -60,8 +60,6 @@
 		2D17D9840F538B710027F526 /* cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D17D9830F538B710027F526 /* cfg.h */; };
 		2D1A748A107A66C0000049E3 /* MemoryEditorTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D1A7488107A66C0000049E3 /* MemoryEditorTableView.h */; };
 		2D1A748B107A66C0000049E3 /* MemoryEditorTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D1A7489107A66C0000049E3 /* MemoryEditorTableView.m */; };
-		2D20134221D45A5B005793AE /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D20134021D076AA005793AE /* SDL2.framework */; };
-		2D20134321D45A5B005793AE /* SDL2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2D20134021D076AA005793AE /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		2D27A624106BE2BF002AAAE7 /* DisasmTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D27A622106BE2BF002AAAE7 /* DisasmTableView.h */; };
 		2D27A625106BE2BF002AAAE7 /* DisasmTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D27A623106BE2BF002AAAE7 /* DisasmTableView.m */; };
 		2D2EAFF80DEE1E8100271295 /* pbi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D2EAFEE0DEE1E8100271295 /* pbi.c */; };
@@ -339,6 +337,7 @@
 		77324B9224AC2CC50007CB07 /* close810snd.wav in Resources */ = {isa = PBXBuildFile; fileRef = 77324B9024AC2CC50007CB07 /* close810snd.wav */; };
 		77324B9324AC2CC50007CB07 /* open810snd.wav in Resources */ = {isa = PBXBuildFile; fileRef = 77324B9124AC2CC50007CB07 /* open810snd.wav */; };
 		77A5A9D521EC3B440098C3A5 /* lock.png in Resources */ = {isa = PBXBuildFile; fileRef = 77A5A9D421EC3B430098C3A5 /* lock.png */; };
+		77E41FEC25A6BB70005E9C28 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77E41FEB25A6BB70005E9C28 /* SDL2.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -358,7 +357,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				2D20134321D45A5B005793AE /* SDL2.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -449,7 +447,6 @@
 		2D17D9830F538B710027F526 /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = ../cfg.h; sourceTree = SOURCE_ROOT; };
 		2D1A7488107A66C0000049E3 /* MemoryEditorTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryEditorTableView.h; sourceTree = SOURCE_ROOT; };
 		2D1A7489107A66C0000049E3 /* MemoryEditorTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MemoryEditorTableView.m; sourceTree = SOURCE_ROOT; };
-		2D20134021D076AA005793AE /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = "<group>"; };
 		2D20E42008565D3600649DDC /* MonitorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonitorWindow.h; sourceTree = "<group>"; };
 		2D20E42108565D3600649DDC /* MonitorWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MonitorWindow.m; sourceTree = "<group>"; };
 		2D27A622106BE2BF002AAAE7 /* DisasmTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisasmTableView.h; sourceTree = SOURCE_ROOT; };
@@ -660,6 +657,7 @@
 		77324B9024AC2CC50007CB07 /* close810snd.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = close810snd.wav; sourceTree = "<group>"; };
 		77324B9124AC2CC50007CB07 /* open810snd.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = open810snd.wav; sourceTree = "<group>"; };
 		77A5A9D421EC3B430098C3A5 /* lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock.png; sourceTree = "<group>"; };
+		77E41FEB25A6BB70005E9C28 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = "<group>"; };
 		F507FF78034EB78801A8C8B4 /* doc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = doc.icns; sourceTree = "<group>"; };
 		F5176916034BFE7501A8C8B4 /* Atari800MacX Help */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = folder; path = "Atari800MacX Help"; sourceTree = "<group>"; };
 		F555833A030EF41401A8C8B4 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
@@ -731,8 +729,8 @@
 			files = (
 				2DAEDBC709B69AED005FF181 /* Cocoa.framework in Frameworks */,
 				2DAEDBC809B69AED005FF181 /* IOKit.framework in Frameworks */,
-				2D20134221D45A5B005793AE /* SDL2.framework in Frameworks */,
 				2DDD85100AAA055D00DE182D /* Carbon.framework in Frameworks */,
+				77E41FEC25A6BB70005E9C28 /* SDL2.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -860,8 +858,8 @@
 		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				77E41FEB25A6BB70005E9C28 /* SDL2.framework */,
 				2DDD850F0AAA055D00DE182D /* Carbon.framework */,
-				2D20134021D076AA005793AE /* SDL2.framework */,
 				2D9863E407BED49700596C6B /* IOKit.framework */,
 				2DFB2BC808A99F86004EF21F /* OpenGL.framework */,
 				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
@@ -1646,7 +1644,6 @@
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					.,
-					"$(HOME)/Library/Frameworks",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
 					"$(PROJECT_DIR)",
 				);
@@ -1692,17 +1689,13 @@
 				CODE_SIGN_IDENTITY = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					.,
-					"$(HOME)/Library/Frameworks",
 					"/Users/markg/Atari800MacX/atari800-MacOSX-3.0/src/Atari800MacX",
 					"/Users/markg/Atari800MacX/atari800-MacOSX-3.0/SDL-1.2.9/Xcode/SDL/build",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
 					"$(PROJECT_DIR)",
 				);
 				"FRAMEWORK_SEARCH_PATHS[arch=*]" = (
 					.,
-					"$(HOME)/Library/Frameworks",
-					"/Users/markg/Atari800MacX/atari800-MacOSX-3.0/src/Atari800MacX",
-					"/Users/markg/Atari800MacX/atari800-MacOSX-3.0/SDL-1.2.9/Xcode/SDL/build",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
 					"$(PROJECT_DIR)",
 				);

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18G87</string>
+	<string>19E287</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11C504</string>
+	<string>12C33</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>GM</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>19B90</string>
+	<string>20C63</string>
 	<key>DTSDKName</key>
-	<string>macosx10.15</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1130</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>11C504</string>
+	<string>12C33</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
 </dict>

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/_CodeSignature/CodeResources

@@ -10,7 +10,7 @@
 		</data>
 		<key>Resources/Info.plist</key>
 		<data>
-		eqy0vvISpY1m2UE2zzwN5nsOg00=
+		tGFoM6QHKngffYbWA76aPn/ESNM=
 		</data>
 		<key>Resources/LICENSE-bsd.txt</key>
 		<data>
@@ -46,11 +46,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			eqy0vvISpY1m2UE2zzwN5nsOg00=
+			tGFoM6QHKngffYbWA76aPn/ESNM=
 			</data>
 			<key>hash2</key>
 			<data>
-			URtZhZZMVQ0W8AnIoo1VF2mkN9aBvt5La1el7xY0mGU=
+			fgTFYKM0llbznibqeBwDi/6Y3eVW0HtYW+1EdComD7E=
 			</data>
 		</dict>
 		<key>Resources/LICENSE-bsd.txt</key>

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Headers/SDL.h

@@ -59,6 +59,8 @@
 #include "SDL_timer.h"
 #include "SDL_version.h"
 #include "SDL_video.h"
+#include "SDL_locale.h"
+#include "SDL_misc.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Headers/SDL_assert.h

@@ -53,6 +53,8 @@ assert can have unique static variables associated with it.
     #define SDL_TriggerBreakpoint() __debugbreak()
 #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif ( defined(__APPLE__) && defined(__arm64__) )  /* this might work on other ARM targets, but this is a known quantity... */
+    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
 #elif defined(__386__) && defined(__WATCOMC__)
     #define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
 #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h

@@ -125,6 +125,8 @@
 #define HAVE_SQRTF  1
 #define HAVE_TAN    1
 #define HAVE_TANF   1
+#define HAVE_TRUNC    1
+#define HAVE_TRUNCF   1
 #define HAVE_SIGACTION  1
 #define HAVE_SETJMP 1
 #define HAVE_NANOSLEEP  1
@@ -139,10 +141,16 @@
 #define SDL_AUDIO_DRIVER_DUMMY  1
 
 /* Enable various input drivers */
+#define SDL_JOYSTICK_HIDAPI 1
 #define SDL_JOYSTICK_IOKIT  1
-#define SDL_JOYSTICK_HIDAPI  1
+#define SDL_JOYSTICK_VIRTUAL    1
 #define SDL_HAPTIC_IOKIT    1
 
+/* The MFI controller support requires ARC Objective C runtime */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)
+#define SDL_JOYSTICK_MFI 1
+#endif
+
 /* Enable the dummy sensor driver */
 #define SDL_SENSOR_DUMMY  1
 
@@ -195,7 +203,7 @@
 #endif
 
 /* Metal only supported on 64-bit architectures with 10.11+ */
-#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
+#if TARGET_RT_64_BIT && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
 #define SDL_PLATFORM_SUPPORTS_METAL    1
 #else
 #define SDL_PLATFORM_SUPPORTS_METAL    0

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h

@@ -246,10 +246,33 @@ extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void);
  * \return Pointer to newly-allocated block, NULL if out of memory.
  *
  * \sa SDL_SIMDAlignment
+ * \sa SDL_SIMDRealloc
  * \sa SDL_SIMDFree
  */
 extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len);
 
+/**
+ * \brief Reallocate memory obtained from SDL_SIMDAlloc
+ *
+ * It is not valid to use this function on a pointer from anything but
+ *  SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc,
+ *  SDL_malloc, memalign, new[], etc.
+ *
+ *  \param mem The pointer obtained from SDL_SIMDAlloc. This function also
+ *             accepts NULL, at which point this function is the same as
+ *             calling SDL_realloc with a NULL pointer.
+ *  \param len The length, in bytes, of the block to allocated. The actual
+ *             allocated block might be larger due to padding, etc. Passing 0
+ *             will return a non-NULL pointer, assuming the system isn't out of
+ *             memory.
+ * \return Pointer to newly-reallocated block, NULL if out of memory.
+ *
+ * \sa SDL_SIMDAlignment
+ * \sa SDL_SIMDAlloc
+ * \sa SDL_SIMDFree
+ */
+extern DECLSPEC void * SDLCALL SDL_SIMDRealloc(void *mem, const size_t len);
+
 /**
  * \brief Deallocate memory obtained from SDL_SIMDAlloc
  *
@@ -260,6 +283,7 @@ extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len);
  * However, SDL_SIMDFree(NULL) is a legal no-op.
  *
  * \sa SDL_SIMDAlloc
+ * \sa SDL_SIMDRealloc
  */
 extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
 

atari800-MacOSX/src/Atari800MacX/SDL2.framework/Versions/A/Headers/SDL_error.h

@@ -37,9 +37,45 @@ extern "C" {
 #endif
 
 /* Public functions */
-/* SDL_SetError() unconditionally returns -1. */
+
+
+/**
+ *  \brief Set the error message for the current thread
+ *
+ *  \return -1, there is no error handling for this function
+ */
 extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
+
+/**
+ *  \brief Get the last error message that was set
+ *
+ * SDL API functions may set error messages and then succeed, so you should
+ * only use the error value if a function fails.
+ * 
+ * This returns a pointer to a static buffer for convenience and should not
+ * be called by multiple threads simultaneously.
+ *
+ *  \return a pointer to the last error message that was set
+ */
 extern DECLSPEC const char *SDLCALL SDL_GetError(void);
+
+/**
+ *  \brief Get the last error message that was set for the current thread
+ *
+ * SDL API functions may set error messages and then succeed, so you should
+ * only use the error value if a function fails.
+ * 
+ *  \param errstr A buffer to fill with the last error message that was set
+ *                for the current thread
+ *  \param maxlen The size of the buffer pointed to by the errstr parameter
+ *
+ *  \return errstr
+ */
+extern DECLSPEC char * SDLCALL SDL_GetErrorMsg(char *errstr, int maxlen);
+
+/**
+ *  \brief Clear the error message for the current thread
+ */
 extern DECLSPEC void SDLCALL SDL_ClearError(void);
 
 /**