From 8a1dc6bfe00fde08b34d9187ca944c1f4a809bd0 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 30 Apr 2022 14:47:48 -0700
Subject: [PATCH] Updated Xcode projects to SDL 2.0.22
---
Xcode/SDL_image.xcodeproj/project.pbxproj | 8 -
Xcode/iOS/SDL2.framework/Headers/SDL.h | 124 +-
Xcode/iOS/SDL2.framework/Headers/SDL_assert.h | 131 +-
Xcode/iOS/SDL2.framework/Headers/SDL_atomic.h | 170 +-
Xcode/iOS/SDL2.framework/Headers/SDL_audio.h | 1313 ++++++---
Xcode/iOS/SDL2.framework/Headers/SDL_bits.h | 17 +-
.../SDL2.framework/Headers/SDL_blendmode.h | 111 +-
.../SDL2.framework/Headers/SDL_clipboard.h | 37 +-
Xcode/iOS/SDL2.framework/Headers/SDL_config.h | 6 +-
.../Headers/SDL_config_iphoneos.h | 29 +-
.../iOS/SDL2.framework/Headers/SDL_copying.h | 2 +-
.../iOS/SDL2.framework/Headers/SDL_cpuinfo.h | 402 ++-
Xcode/iOS/SDL2.framework/Headers/SDL_endian.h | 157 +-
Xcode/iOS/SDL2.framework/Headers/SDL_error.h | 91 +-
Xcode/iOS/SDL2.framework/Headers/SDL_events.h | 572 +++-
.../SDL2.framework/Headers/SDL_filesystem.h | 137 +-
.../Headers/SDL_gamecontroller.h | 752 +++++-
.../iOS/SDL2.framework/Headers/SDL_gesture.h | 42 +-
Xcode/iOS/SDL2.framework/Headers/SDL_haptic.h | 523 ++--
Xcode/iOS/SDL2.framework/Headers/SDL_hidapi.h | 451 ++++
Xcode/iOS/SDL2.framework/Headers/SDL_hints.h | 2339 ++++++++++------
.../iOS/SDL2.framework/Headers/SDL_joystick.h | 768 +++++-
.../iOS/SDL2.framework/Headers/SDL_keyboard.h | 246 +-
.../iOS/SDL2.framework/Headers/SDL_keycode.h | 22 +-
Xcode/iOS/SDL2.framework/Headers/SDL_loadso.h | 50 +-
Xcode/iOS/SDL2.framework/Headers/SDL_locale.h | 103 +
Xcode/iOS/SDL2.framework/Headers/SDL_log.h | 231 +-
Xcode/iOS/SDL2.framework/Headers/SDL_main.h | 89 +-
.../SDL2.framework/Headers/SDL_messagebox.h | 93 +-
Xcode/iOS/SDL2.framework/Headers/SDL_metal.h | 60 +-
Xcode/iOS/SDL2.framework/Headers/SDL_misc.h | 79 +
Xcode/iOS/SDL2.framework/Headers/SDL_mouse.h | 372 ++-
Xcode/iOS/SDL2.framework/Headers/SDL_mutex.h | 352 ++-
Xcode/iOS/SDL2.framework/Headers/SDL_name.h | 2 +-
Xcode/iOS/SDL2.framework/Headers/SDL_opengl.h | 2 +-
.../iOS/SDL2.framework/Headers/SDL_opengles.h | 2 +-
.../SDL2.framework/Headers/SDL_opengles2.h | 4 +-
Xcode/iOS/SDL2.framework/Headers/SDL_pixels.h | 251 +-
.../iOS/SDL2.framework/Headers/SDL_platform.h | 41 +-
Xcode/iOS/SDL2.framework/Headers/SDL_power.h | 33 +-
Xcode/iOS/SDL2.framework/Headers/SDL_quit.h | 2 +-
Xcode/iOS/SDL2.framework/Headers/SDL_rect.h | 256 +-
Xcode/iOS/SDL2.framework/Headers/SDL_render.h | 1694 ++++++++----
.../iOS/SDL2.framework/Headers/SDL_revision.h | 2 +-
Xcode/iOS/SDL2.framework/Headers/SDL_rwops.h | 648 ++++-
.../iOS/SDL2.framework/Headers/SDL_scancode.h | 2 +-
Xcode/iOS/SDL2.framework/Headers/SDL_sensor.h | 144 +-
Xcode/iOS/SDL2.framework/Headers/SDL_shape.h | 65 +-
Xcode/iOS/SDL2.framework/Headers/SDL_stdinc.h | 173 +-
.../iOS/SDL2.framework/Headers/SDL_surface.h | 717 ++++-
Xcode/iOS/SDL2.framework/Headers/SDL_system.h | 433 ++-
Xcode/iOS/SDL2.framework/Headers/SDL_syswm.h | 95 +-
Xcode/iOS/SDL2.framework/Headers/SDL_thread.h | 395 ++-
Xcode/iOS/SDL2.framework/Headers/SDL_timer.h | 151 +-
Xcode/iOS/SDL2.framework/Headers/SDL_touch.h | 64 +-
Xcode/iOS/SDL2.framework/Headers/SDL_types.h | 2 +-
.../iOS/SDL2.framework/Headers/SDL_version.h | 118 +-
Xcode/iOS/SDL2.framework/Headers/SDL_video.h | 1726 ++++++++----
Xcode/iOS/SDL2.framework/Headers/SDL_vulkan.h | 275 +-
Xcode/iOS/SDL2.framework/Headers/begin_code.h | 37 +-
Xcode/iOS/SDL2.framework/Headers/close_code.h | 2 +-
Xcode/iOS/SDL2.framework/Info.plist | Bin 812 -> 814 bytes
Xcode/iOS/SDL2.framework/License.txt | 19 +
Xcode/iOS/SDL2.framework/ReadMe.txt | 32 +
Xcode/iOS/SDL2.framework/SDL2 | Bin 7505860 -> 8304088 bytes
Xcode/iOS/SDL2.framework/default.metallib | Bin 22544 -> 21785 bytes
.../SDL2.framework/Versions/A/Headers/SDL.h | 18 +-
.../Versions/A/Headers/SDL_assert.h | 8 +-
.../Versions/A/Headers/SDL_atomic.h | 44 +-
.../Versions/A/Headers/SDL_audio.h | 665 +++--
.../Versions/A/Headers/SDL_bits.h | 6 +-
.../Versions/A/Headers/SDL_blendmode.h | 26 +-
.../Versions/A/Headers/SDL_clipboard.h | 15 +-
.../Versions/A/Headers/SDL_config.h | 6 +-
.../Versions/A/Headers/SDL_config_macosx.h | 14 +-
.../Versions/A/Headers/SDL_copying.h | 2 +-
.../Versions/A/Headers/SDL_cpuinfo.h | 116 +-
.../Versions/A/Headers/SDL_endian.h | 122 +-
.../Versions/A/Headers/SDL_error.h | 53 +-
.../Versions/A/Headers/SDL_events.h | 128 +-
.../Versions/A/Headers/SDL_filesystem.h | 18 +-
.../Versions/A/Headers/SDL_gamecontroller.h | 243 +-
.../Versions/A/Headers/SDL_gesture.h | 2 +-
.../Versions/A/Headers/SDL_haptic.h | 36 +-
.../Versions/A/Headers/SDL_hidapi.h | 451 ++++
.../Versions/A/Headers/SDL_hints.h | 2344 ++++++++++-------
.../Versions/A/Headers/SDL_joystick.h | 233 +-
.../Versions/A/Headers/SDL_keyboard.h | 61 +-
.../Versions/A/Headers/SDL_keycode.h | 8 +-
.../Versions/A/Headers/SDL_loadso.h | 8 +-
.../Versions/A/Headers/SDL_locale.h | 66 +-
.../Versions/A/Headers/SDL_log.h | 37 +-
.../Versions/A/Headers/SDL_main.h | 58 +-
.../Versions/A/Headers/SDL_messagebox.h | 4 +-
.../Versions/A/Headers/SDL_metal.h | 60 +-
.../Versions/A/Headers/SDL_misc.h | 4 +-
.../Versions/A/Headers/SDL_mouse.h | 51 +-
.../Versions/A/Headers/SDL_mutex.h | 69 +-
.../Versions/A/Headers/SDL_name.h | 2 +-
.../Versions/A/Headers/SDL_opengl.h | 2 +-
.../Versions/A/Headers/SDL_opengles.h | 2 +-
.../Versions/A/Headers/SDL_opengles2.h | 4 +-
.../Versions/A/Headers/SDL_pixels.h | 33 +-
.../Versions/A/Headers/SDL_platform.h | 25 +-
.../Versions/A/Headers/SDL_power.h | 4 +-
.../Versions/A/Headers/SDL_quit.h | 2 +-
.../Versions/A/Headers/SDL_rect.h | 168 +-
.../Versions/A/Headers/SDL_render.h | 407 ++-
.../Versions/A/Headers/SDL_revision.h | 2 +-
.../Versions/A/Headers/SDL_rwops.h | 467 +++-
.../Versions/A/Headers/SDL_scancode.h | 2 +-
.../Versions/A/Headers/SDL_sensor.h | 62 +-
.../Versions/A/Headers/SDL_shape.h | 65 +-
.../Versions/A/Headers/SDL_stdinc.h | 93 +-
.../Versions/A/Headers/SDL_surface.h | 166 +-
.../Versions/A/Headers/SDL_system.h | 113 +-
.../Versions/A/Headers/SDL_syswm.h | 19 +-
.../Versions/A/Headers/SDL_thread.h | 91 +-
.../Versions/A/Headers/SDL_timer.h | 58 +-
.../Versions/A/Headers/SDL_touch.h | 14 +-
.../Versions/A/Headers/SDL_types.h | 2 +-
.../Versions/A/Headers/SDL_version.h | 28 +-
.../Versions/A/Headers/SDL_video.h | 366 ++-
.../Versions/A/Headers/SDL_vulkan.h | 86 +-
.../Versions/A/Headers/begin_code.h | 25 +-
.../Versions/A/Headers/close_code.h | 2 +-
.../Versions/A/Resources/Info.plist | 18 +-
.../Versions/A/Resources/License.txt | 2 +-
.../Versions/A/Resources/default.metallib | Bin 22174 -> 21952 bytes
Xcode/macOS/SDL2.framework/Versions/A/SDL2 | Bin 2839984 -> 3047536 bytes
.../Versions/A/_CodeSignature/CodeResources | 420 ++-
.../Versions/A/_CodeSignature/CodeResources | 224 ++
Xcode/macOS/webp.framework/Versions/A/webp | Bin 1626668 -> 1729072 bytes
.../showimage.xcodeproj/project.pbxproj | 4 +-
Xcode/tvOS/SDL2.framework/Headers/SDL.h | 124 +-
.../tvOS/SDL2.framework/Headers/SDL_assert.h | 131 +-
.../tvOS/SDL2.framework/Headers/SDL_atomic.h | 170 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_audio.h | 1313 ++++++---
Xcode/tvOS/SDL2.framework/Headers/SDL_bits.h | 17 +-
.../SDL2.framework/Headers/SDL_blendmode.h | 111 +-
.../SDL2.framework/Headers/SDL_clipboard.h | 37 +-
.../tvOS/SDL2.framework/Headers/SDL_config.h | 6 +-
.../Headers/SDL_config_iphoneos.h | 29 +-
.../tvOS/SDL2.framework/Headers/SDL_copying.h | 2 +-
.../tvOS/SDL2.framework/Headers/SDL_cpuinfo.h | 402 ++-
.../tvOS/SDL2.framework/Headers/SDL_endian.h | 157 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_error.h | 91 +-
.../tvOS/SDL2.framework/Headers/SDL_events.h | 572 +++-
.../SDL2.framework/Headers/SDL_filesystem.h | 137 +-
.../Headers/SDL_gamecontroller.h | 752 +++++-
.../tvOS/SDL2.framework/Headers/SDL_gesture.h | 42 +-
.../tvOS/SDL2.framework/Headers/SDL_haptic.h | 523 ++--
.../tvOS/SDL2.framework/Headers/SDL_hidapi.h | 451 ++++
Xcode/tvOS/SDL2.framework/Headers/SDL_hints.h | 2339 ++++++++++------
.../SDL2.framework/Headers/SDL_joystick.h | 768 +++++-
.../SDL2.framework/Headers/SDL_keyboard.h | 246 +-
.../tvOS/SDL2.framework/Headers/SDL_keycode.h | 22 +-
.../tvOS/SDL2.framework/Headers/SDL_loadso.h | 50 +-
.../tvOS/SDL2.framework/Headers/SDL_locale.h | 103 +
Xcode/tvOS/SDL2.framework/Headers/SDL_log.h | 231 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_main.h | 89 +-
.../SDL2.framework/Headers/SDL_messagebox.h | 93 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_metal.h | 60 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_misc.h | 79 +
Xcode/tvOS/SDL2.framework/Headers/SDL_mouse.h | 372 ++-
Xcode/tvOS/SDL2.framework/Headers/SDL_mutex.h | 352 ++-
Xcode/tvOS/SDL2.framework/Headers/SDL_name.h | 2 +-
.../tvOS/SDL2.framework/Headers/SDL_opengl.h | 2 +-
.../SDL2.framework/Headers/SDL_opengles.h | 2 +-
.../SDL2.framework/Headers/SDL_opengles2.h | 4 +-
.../tvOS/SDL2.framework/Headers/SDL_pixels.h | 251 +-
.../SDL2.framework/Headers/SDL_platform.h | 41 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_power.h | 33 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_quit.h | 2 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_rect.h | 256 +-
.../tvOS/SDL2.framework/Headers/SDL_render.h | 1694 ++++++++----
.../SDL2.framework/Headers/SDL_revision.h | 2 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_rwops.h | 648 ++++-
.../SDL2.framework/Headers/SDL_scancode.h | 2 +-
.../tvOS/SDL2.framework/Headers/SDL_sensor.h | 144 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_shape.h | 65 +-
.../tvOS/SDL2.framework/Headers/SDL_stdinc.h | 173 +-
.../tvOS/SDL2.framework/Headers/SDL_surface.h | 717 ++++-
.../tvOS/SDL2.framework/Headers/SDL_system.h | 433 ++-
Xcode/tvOS/SDL2.framework/Headers/SDL_syswm.h | 95 +-
.../tvOS/SDL2.framework/Headers/SDL_thread.h | 395 ++-
Xcode/tvOS/SDL2.framework/Headers/SDL_timer.h | 151 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_touch.h | 64 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_types.h | 2 +-
.../tvOS/SDL2.framework/Headers/SDL_version.h | 118 +-
Xcode/tvOS/SDL2.framework/Headers/SDL_video.h | 1726 ++++++++----
.../tvOS/SDL2.framework/Headers/SDL_vulkan.h | 275 +-
.../tvOS/SDL2.framework/Headers/begin_code.h | 37 +-
.../tvOS/SDL2.framework/Headers/close_code.h | 2 +-
Xcode/tvOS/SDL2.framework/Info.plist | Bin 809 -> 812 bytes
Xcode/tvOS/SDL2.framework/License.txt | 19 +
Xcode/tvOS/SDL2.framework/ReadMe.txt | 32 +
Xcode/tvOS/SDL2.framework/SDL2 | Bin 3832936 -> 4204552 bytes
Xcode/tvOS/SDL2.framework/default.metallib | Bin 22544 -> 21904 bytes
199 files changed, 32337 insertions(+), 10141 deletions(-)
create mode 100644 Xcode/iOS/SDL2.framework/Headers/SDL_hidapi.h
create mode 100644 Xcode/iOS/SDL2.framework/Headers/SDL_locale.h
create mode 100644 Xcode/iOS/SDL2.framework/Headers/SDL_misc.h
create mode 100644 Xcode/iOS/SDL2.framework/License.txt
create mode 100644 Xcode/iOS/SDL2.framework/ReadMe.txt
create mode 100644 Xcode/macOS/SDL2.framework/Versions/A/Headers/SDL_hidapi.h
create mode 100644 Xcode/macOS/webp.framework/Versions/A/_CodeSignature/CodeResources
create mode 100644 Xcode/tvOS/SDL2.framework/Headers/SDL_hidapi.h
create mode 100644 Xcode/tvOS/SDL2.framework/Headers/SDL_locale.h
create mode 100644 Xcode/tvOS/SDL2.framework/Headers/SDL_misc.h
create mode 100644 Xcode/tvOS/SDL2.framework/License.txt
create mode 100644 Xcode/tvOS/SDL2.framework/ReadMe.txt
diff --git a/Xcode/SDL_image.xcodeproj/project.pbxproj b/Xcode/SDL_image.xcodeproj/project.pbxproj
index 9b8cd31..77c4d78 100644
--- a/Xcode/SDL_image.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_image.xcodeproj/project.pbxproj
@@ -543,10 +543,6 @@
007288120F0DA5BA00C302A9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(SDKROOT)/System/iOSSupport/System/Library/Frameworks",
- );
OTHER_LDFLAGS = (
"-weak_framework",
webp,
@@ -635,10 +631,6 @@
007288160F0DA5C400C302A9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(SDKROOT)/System/iOSSupport/System/Library/Frameworks",
- );
OTHER_LDFLAGS = (
"-weak_framework",
webp,
diff --git a/Xcode/iOS/SDL2.framework/Headers/SDL.h b/Xcode/iOS/SDL2.framework/Headers/SDL.h
index 7ab7287..28778f3 100644
--- a/Xcode/iOS/SDL2.framework/Headers/SDL.h
+++ b/Xcode/iOS/SDL2.framework/Headers/SDL.h
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -42,6 +42,7 @@
#include <SDL2/SDL_filesystem.h>
#include <SDL2/SDL_gamecontroller.h>
#include <SDL2/SDL_haptic.h>
+#include <SDL2/SDL_hidapi.h>
#include <SDL2/SDL_hints.h>
#include <SDL2/SDL_joystick.h>
#include <SDL2/SDL_loadso.h>
@@ -59,6 +60,8 @@
#include <SDL2/SDL_timer.h>
#include <SDL2/SDL_version.h>
#include <SDL2/SDL_video.h>
+#include <SDL2/SDL_locale.h>
+#include <SDL2/SDL_misc.h>
#include <SDL2/begin_code.h>
/* Set up for C function definitions, even when using C++ */
@@ -91,37 +94,130 @@ extern "C" {
/* @} */
/**
- * This function initializes the subsystems specified by \c flags
+ * Initialize the SDL library.
+ *
+ * SDL_Init() simply forwards to calling SDL_InitSubSystem(). Therefore, the
+ * two may be used interchangeably. Though for readability of your code
+ * SDL_InitSubSystem() might be preferred.
+ *
+ * The file I/O (for example: SDL_RWFromFile) and threading (SDL_CreateThread)
+ * subsystems are initialized by default. Message boxes
+ * (SDL_ShowSimpleMessageBox) also attempt to work without initializing the
+ * video subsystem, in hopes of being useful in showing an error dialog when
+ * SDL_Init fails. You must specifically initialize other subsystems if you
+ * use them in your application.
+ *
+ * Logging (such as SDL_Log) works without initialization, too.
+ *
+ * `flags` may be any of the following OR'd together:
+ *
+ * - `SDL_INIT_TIMER`: timer subsystem
+ * - `SDL_INIT_AUDIO`: audio subsystem
+ * - `SDL_INIT_VIDEO`: video subsystem; automatically initializes the events
+ * subsystem
+ * - `SDL_INIT_JOYSTICK`: joystick subsystem; automatically initializes the
+ * events subsystem
+ * - `SDL_INIT_HAPTIC`: haptic (force feedback) subsystem
+ * - `SDL_INIT_GAMECONTROLLER`: controller subsystem; automatically
+ * initializes the joystick subsystem
+ * - `SDL_INIT_EVENTS`: events subsystem
+ * - `SDL_INIT_EVERYTHING`: all of the above subsystems
+ * - `SDL_INIT_NOPARACHUTE`: compatibility; this flag is ignored
+ *
+ * Subsystem initialization is ref-counted, you must call SDL_QuitSubSystem()
+ * for each SDL_InitSubSystem() to correctly shutdown a subsystem manually (or
+ * call SDL_Quit() to force shutdown). If a subsystem is already loaded then
+ * this call will increase the ref-count and return.
+ *
+ * \param flags subsystem initialization flags
+ * \returns 0 on success or a negative error code on failure; call
+ * SDL_GetError() for more information.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_InitSubSystem
+ * \sa SDL_Quit
+ * \sa SDL_SetMainReady
+ * \sa SDL_WasInit
*/
extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
/**
- * This function initializes specific SDL subsystems
+ * Compatibility function to initialize the SDL library.
+ *
+ * In SDL2, this function and SDL_Init() are interchangeable.
*
- * Subsystem initialization is ref-counted, you must call
- * SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly
- * shutdown a subsystem manually (or call SDL_Quit() to force shutdown).
- * If a subsystem is already loaded then this call will
- * increase the ref-count and return.
+ * \param flags any of the flags used by SDL_Init(); see SDL_Init for details.
+ * \returns 0 on success or a negative error code on failure; call
+ * SDL_GetError() for more information.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_Init
+ * \sa SDL_Quit
+ * \sa SDL_QuitSubSystem
*/
extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
/**
- * This function cleans up specific SDL subsystems
+ * Shut down specific SDL subsystems.
+ *
+ * If you start a subsystem using a call to that subsystem's init function
+ * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(),
+ * SDL_QuitSubSystem() and SDL_WasInit() will not work. You will need to use
+ * that subsystem's quit function (SDL_VideoQuit()) directly instead. But
+ * generally, you should not be using those functions directly anyhow; use
+ * SDL_Init() instead.
+ *
+ * You still need to call SDL_Quit() even if you close all open subsystems
+ * with SDL_QuitSubSystem().
+ *
+ * \param flags any of the flags used by SDL_Init(); see SDL_Init for details.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_InitSubSystem
+ * \sa SDL_Quit
*/
extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
/**
- * This function returns a mask of the specified subsystems which have
- * previously been initialized.
+ * Get a mask of the specified subsystems which are currently initialized.
+ *
+ * \param flags any of the flags used by SDL_Init(); see SDL_Init for details.
+ * \returns a mask of all initialized subsystems if `flags` is 0, otherwise it
+ * returns the initialization status of the specified subsystems.
+ *
+ * The return value does not include SDL_INIT_NOPARACHUTE.
*
- * If \c flags is 0, it returns a mask of all initialized subsystems.
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_Init
+ * \sa SDL_InitSubSystem
*/
extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
/**
- * This function cleans up all initialized subsystems. You should
- * call it upon all exit conditions.
+ * Clean up all initialized subsystems.
+ *
+ * You should call this function even if you have already shutdown each
+ * initialized subsystem with SDL_QuitSubSystem(). It is safe to call this
+ * function even in the case of errors in initialization.
+ *
+ * If you start a subsystem using a call to that subsystem's init function
+ * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(),
+ * then you must use that subsystem's quit function (SDL_VideoQuit()) to shut
+ * it down before calling SDL_Quit(). But generally, you should not be using
+ * those functions directly anyhow; use SDL_Init() instead.
+ *
+ * You can use this function with atexit() to ensure that it is run when your
+ * application is shutdown, but it is not wise to do this from a library or
+ * other dynamically loaded code.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_Init
+ * \sa SDL_QuitSubSystem
*/
extern DECLSPEC void SDLCALL SDL_Quit(void);
diff --git a/Xcode/iOS/SDL2.framework/Headers/SDL_assert.h b/Xcode/iOS/SDL2.framework/Headers/SDL_assert.h
index 969ceda..835e3ea 100644
--- a/Xcode/iOS/SDL2.framework/Headers/SDL_assert.h
+++ b/Xcode/iOS/SDL2.framework/Headers/SDL_assert.h
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -53,6 +53,10 @@ 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__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */
+ #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
+#elif defined(__APPLE__) && defined(__arm__)
+ #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" )
#elif defined(__386__) && defined(__WATCOMC__)
#define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
#elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)
@@ -185,92 +189,121 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
#define SDL_assert_always(condition) SDL_enabled_assert(condition)
+/**
+ * A callback that fires when an SDL assertion fails.
+ *
+ * \param data a pointer to the SDL_AssertData structure corresponding to the
+ * current assertion
+ * \param userdata what was passed as `userdata` to SDL_SetAssertionHandler()
+ * \returns an SDL_AssertState value indicating how to handle the failure.
+ */
typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)(
const SDL_AssertData* data, void* userdata);
/**
- * \brief Set an application-defined assertion handler.
+ * Set an application-defined assertion handler.
*
- * This allows an app to show its own assertion UI and/or force the
- * response to an assertion failure. If the app doesn't provide this, SDL
- * will try to do the right thing, popping up a system-specific GUI dialog,
- * and probably minimizing any fullscreen windows.
+ * This function allows an application to show its own assertion UI and/or
+ * force the response to an assertion failure. If the application doesn't
+ * provide this, SDL will try to do the right thing, popping up a
+ * system-specific GUI dialog, and probably minimizing any fullscreen windows.
*
- * This callback may fire from any thread, but it runs wrapped in a mutex, so
- * it will only fire from one thread at a time.
+ * This callback may fire from any thread, but it runs wrapped in a mutex, so
+ * it will only fire from one thread at a time.
*
- * Setting the callback to NULL restores SDL's original internal handler.
+ * This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
*
- * This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
+ * \param handler the SDL_AssertionHandler function to call when an assertion
+ * fails or NULL for the default handler
+ * \param userdata a pointer that is passed to `handler`
*
- * Return SDL_AssertState value of how to handle the assertion failure.
+ * \since This function is available since SDL 2.0.0.
*
- * \param handler Callback function, called when an assertion fails.
- * \param userdata A pointer passed to the callback as-is.
+ * \sa SDL_GetAssertionHandler
*/
extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
SDL_AssertionHandler handler,
void *userdata);
/**
- * \brief Get the default assertion handler.
+ * Get the default assertion handler.
*
- * This returns the function pointer that is called by default when an
- * assertion is triggered. This is an internal function provided by SDL,
- * that is used for assertions when SDL_SetAssertionHandler() hasn't been
- * used to provide a different function.
+ * This returns the function pointer that is called by default when an
+ * assertion is triggered. This is an internal function provided by SDL, that
+ * is used for assertions when SDL_SetAssertionHandler() hasn't been used to
+ * provide a different function.
*
- * \return The default SDL_AssertionHandler that is called when an assert triggers.
+ * \returns the default SDL_AssertionHandler that is called when an assert
+ * triggers.
+ *
+ * \since This function is available since SDL 2.0.2.
+ *
+ * \sa SDL_GetAssertionHandler
*/
extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void);
/**
- * \brief Get the current assertion handler.
+ * Get the current assertion handler.
+ *
+ * This returns the function pointer that is called when an assertion is
+ * triggered. This is either the value last passed to
+ * SDL_SetAssertionHandler(), or if no application-specified function is set,
+ * is equivalent to calling SDL_GetDefaultAssertionHandler().
*
- * This returns the function pointer that is called when an assertion is
- * triggered. This is either the value last passed to
- * SDL_SetAssertionHandler(), or if no application-specified function is
- * set, is equivalent to calling SDL_GetDefaultAssertionHandler().
+ * The parameter `puserdata` is a pointer to a void*, which will store the
+ * "userdata" pointer that was passed to SDL_SetAssertionHandler(). This value
+ * will always be NULL for the default handler. If you don't care about this
+ * data, it is safe to pass a NULL pointer to this function to ignore it.
*
- * \param puserdata Pointer to a void*, which will store the "userdata"
- * pointer that was passed to SDL_SetAssertionHandler().
- * This value will always be NULL for the default handler.
- * If you don't care about this data, it is safe to pass
- * a NULL pointer to this function to ignore it.
- * \return The SDL_AssertionHandler that is called when an assert triggers.
+ * \param puserdata pointer which is filled with the "userdata" pointer that
+ * was passed to SDL_SetAssertionHandler()
+ * \returns the SDL_AssertionHandler that is called when an assert triggers.
+ *
+ * \since This function is available since SDL 2.0.2.
+ *
+ * \sa SDL_SetAssertionHandler
*/
extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata);
/**
- * \brief Get a list of all assertion failures.
+ * Get a list of all assertion failures.
+ *
+ * This function gets all assertions triggered since the last call to
+ * SDL_ResetAssertionReport(), or the start of the program.
*
- * Get all assertions triggered since last call to SDL_ResetAssertionReport(),
- * or the start of the program.
+ * The proper way to examine this data looks something like this:
*
- * The proper way to examine this data looks something like this:
+ * ```c
+ * const SDL_AssertData *item = SDL_GetAssertionReport();
+ * while (item) {
+ * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
+ * item->condition, item->function, item->filename,
+ * item->linenum, item->trigger_count,
+ * item->always_ignore ? "yes" : "no");
+ * item = item->next;
+ * }
+ * ```
*
- * <code>
- * const SDL_AssertData *item = SDL_GetAssertionReport();
- * while (item) {
- * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
- * item->condition, item->function, item->filename,
- * item->linenum, item->trigger_count,
- * item->always_ignore ? "yes" : "no");
- * item = item->next;
- * }
- * </code>
+ * \returns a list of all failed assertions or NULL if the list is empty. This
+ * memory should not be modified or freed by the application.
*
- * \return List of all assertions.
- * \sa SDL_ResetAssertionReport
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_ResetAssertionReport
*/
extern DECLSPEC const SDL_AssertData * SDLCALL SDL_GetAssertionReport(void);
/**
- * \brief Reset the list of all assertion failures.
+ * Clear the list of all assertion failures.
+ *
+ * This function will clear the list of all assertions triggered up to that
+ * point. Immediately following this call, SDL_GetAssertionReport will return
+ * no items. In addition, any previously-triggered assertions will be reset to
+ * a trigger_count of zero, and their always_ignore state will be false.
*
- * Reset list of all assertions triggered.
+ * \since This function is available since SDL 2.0.0.
*
- * \sa SDL_GetAssertionReport
+ * \sa SDL_GetAssertionReport
*/
extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
diff --git a/Xcode/iOS/SDL2.framework/Headers/SDL_atomic.h b/Xcode/iOS/SDL2.framework/Headers/SDL_atomic.h
index 189384b..02a93fb 100644
--- a/Xcode/iOS/SDL2.framework/Headers/SDL_atomic.h
+++ b/Xcode/iOS/SDL2.framework/Headers/SDL_atomic.h
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -89,25 +89,51 @@ extern "C" {
typedef int SDL_SpinLock;
/**
- * \brief Try to lock a spin lock by setting it to a non-zero value.
+ * Try to lock a spin lock by setting it to a non-zero value.
*
- * \param lock Points to the lock.
+ * ***Please note that spinlocks are dangerous if you don't know what you're
+ * doing. Please be careful using any sort of spinlock!***
*
- * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held.
+ * \param lock a pointer to a lock variable
+ * \returns SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already
+ * held.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_AtomicLock
+ * \sa SDL_AtomicUnlock
*/
extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock);
/**
- * \brief Lock a spin lock by setting it to a non-zero value.
+ * Lock a spin lock by setting it to a non-zero value.
+ *
+ * ***Please note that spinlocks are dangerous if you don't know what you're
+ * doing. Please be careful using any sort of spinlock!***
+ *
+ * \param lock a pointer to a lock variable
+ *
+ * \since This function is available since SDL 2.0.0.
*
- * \param lock Points to the lock.
+ * \sa SDL_AtomicTryLock
+ * \sa SDL_AtomicUnlock
*/
extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
/**
- * \brief Unlock a spin lock by setting it to 0. Always returns immediately
+ * Unlock a spin lock by setting it to 0.
+ *
+ * Always returns immediately.
+ *
+ * ***Please note that spinlocks are dangerous if you don't know what you're
+ * doing. Please be careful using any sort of spinlock!***
+ *
+ * \param lock a pointer to a lock variable
+ *
+ * \since This function is available since SDL 2.0.0.
*
- *
(Patch may be truncated, please check the link at the top of this post.)