diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h index fc35a419..d48d9d4a 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h @@ -51,7 +51,6 @@ #include "SDL_power.h" #include "SDL_render.h" #include "SDL_rwops.h" -#include "SDL_sensor.h" #include "SDL_shape.h" #include "SDL_system.h" #include "SDL_thread.h" @@ -81,11 +80,10 @@ extern "C" { #define SDL_INIT_HAPTIC 0x00001000u #define SDL_INIT_GAMECONTROLLER 0x00002000u /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ #define SDL_INIT_EVENTS 0x00004000u -#define SDL_INIT_SENSOR 0x00008000u #define SDL_INIT_NOPARACHUTE 0x00100000u /**< compatibility; this flag is ignored. */ #define SDL_INIT_EVERYTHING ( \ SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \ - SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_SENSOR \ + SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \ ) /* @} */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h index d3e1bfac..d6ea6895 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h @@ -140,8 +140,7 @@ typedef Uint16 SDL_AudioFormat; #define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001 #define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002 #define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004 -#define SDL_AUDIO_ALLOW_SAMPLES_CHANGE 0x00000008 -#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE|SDL_AUDIO_ALLOW_SAMPLES_CHANGE) +#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE) /* @} */ /* @} *//* Audio flags */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h index 32f4113f..7e0340cd 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h @@ -41,10 +41,8 @@ #include "SDL_config_android.h" #elif defined(__PSP__) #include "SDL_config_psp.h" -#elif defined(__OS2__) -#include "SDL_config_os2.h" #else -/* This is a minimal configuration just to get SDL running on new platforms. */ +/* This is a minimal configuration just to get SDL running on new platforms */ #include "SDL_config_minimal.h" #endif /* platform config */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h index 9ebd4a33..29f583e1 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h @@ -102,8 +102,6 @@ #define HAVE_COPYSIGNF 1 #define HAVE_COS 1 #define HAVE_COSF 1 -#define HAVE_EXP 1 -#define HAVE_EXPF 1 #define HAVE_FABS 1 #define HAVE_FABSF 1 #define HAVE_FLOOR 1 @@ -137,12 +135,8 @@ /* Enable various input drivers */ #define SDL_JOYSTICK_IOKIT 1 -#define SDL_JOYSTICK_HIDAPI 1 #define SDL_HAPTIC_IOKIT 1 -/* Enable the dummy sensor driver */ -#define SDL_SENSOR_DUMMY 1 - /* Enable various shared object loading systems */ #define SDL_LOADSO_DLOPEN 1 diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h index ee3a47e8..08127053 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -51,19 +51,16 @@ #include #else #ifdef __ALTIVEC__ -#if defined(HAVE_ALTIVEC_H) && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H) +#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H) #include #undef pixel #undef bool #endif #endif -#if defined(__ARM_NEON__) && !defined(SDL_DISABLE_ARM_NEON_H) -#include -#endif #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif -#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H) +#if HAVE_IMMINTRIN_H && !defined(SDL_DISABLE_IMMINTRIN_H) #include #else #if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H) @@ -162,11 +159,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); -/** - * This function returns true if the CPU has AVX-512F (foundation) features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX512F(void); - /** * This function returns true if the CPU has NEON (ARM SIMD) features. */ @@ -177,6 +169,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); */ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h index af22eb64..3d39e6a7 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h @@ -85,9 +85,6 @@ typedef enum Called on Android in onResume() */ - /* Display events */ - SDL_DISPLAYEVENT = 0x150, /**< Display state change */ - /* Window events */ SDL_WINDOWEVENT = 0x200, /**< Window state change */ SDL_SYSWMEVENT, /**< System specific event */ @@ -147,9 +144,6 @@ typedef enum SDL_AUDIODEVICEADDED = 0x1100, /**< A new audio device is available */ SDL_AUDIODEVICEREMOVED, /**< An audio device has been removed. */ - /* Sensor events */ - SDL_SENSORUPDATE = 0x1200, /**< A sensor was updated */ - /* Render events */ SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */ SDL_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */ @@ -174,21 +168,6 @@ typedef struct SDL_CommonEvent Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ } SDL_CommonEvent; -/** - * \brief Display state change event data (event.display.*) - */ -typedef struct SDL_DisplayEvent -{ - Uint32 type; /**< ::SDL_DISPLAYEVENT */ - Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ - Uint32 display; /**< The associated display index */ - Uint8 event; /**< ::SDL_DisplayEventID */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint32 data1; /**< event dependent data */ -} SDL_DisplayEvent; - /** * \brief Window state change event data (event.window.*) */ @@ -492,17 +471,6 @@ typedef struct SDL_DropEvent } SDL_DropEvent; -/** - * \brief Sensor event structure (event.sensor.*) - */ -typedef struct SDL_SensorEvent -{ - Uint32 type; /**< ::SDL_SENSORUPDATE */ - Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ - Sint32 which; /**< The instance ID of the sensor */ - float data[6]; /**< Up to 6 values from the sensor - additional values can be queried using SDL_SensorGetData() */ -} SDL_SensorEvent; - /** * \brief The "quit requested" event */ @@ -558,7 +526,6 @@ typedef union SDL_Event { Uint32 type; /**< Event type, shared with all events */ SDL_CommonEvent common; /**< Common event data */ - SDL_DisplayEvent display; /**< Window event data */ SDL_WindowEvent window; /**< Window event data */ SDL_KeyboardEvent key; /**< Keyboard event data */ SDL_TextEditingEvent edit; /**< Text editing event data */ @@ -575,7 +542,6 @@ typedef union SDL_Event SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ SDL_AudioDeviceEvent adevice; /**< Audio device event data */ - SDL_SensorEvent sensor; /**< Sensor event data */ SDL_QuitEvent quit; /**< Quit request event data */ SDL_UserEvent user; /**< Custom event data */ SDL_SysWMEvent syswm; /**< System dependent window event data */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h index 6ae9c954..2e024be6 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h @@ -175,14 +175,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); */ extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); -/** - * Get the mapping of a game controller. - * This can be called before any controllers are opened. - * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available - */ -extern DECLSPEC char *SDLCALL SDL_GameControllerMappingForDeviceIndex(int joystick_index); - /** * Open a game controller for use. * The index passed as an argument refers to the N'th game controller on the system. @@ -204,13 +196,6 @@ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromInstanceID(SDL */ extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); -/** - * Get the player index of an opened game controller, or -1 if it's not available - * - * For XInput controllers this returns the XInput user index. - */ -extern DECLSPEC int SDLCALL SDL_GameControllerGetPlayerIndex(SDL_GameController *gamecontroller); - /** * Get the USB vendor ID of an opened controller, if available. * If the vendor ID isn't available this function returns 0. @@ -360,19 +345,6 @@ SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); -/** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. - * - * \param gamecontroller The controller to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds - * - * \return 0, or -1 if rumble isn't supported on this joystick - */ -extern DECLSPEC int SDLCALL SDL_GameControllerRumble(SDL_GameController *gamecontroller, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); - /** * Close a controller previously opened with SDL_GameControllerOpen(). */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h index 2ea1bfc1..e3a2bca5 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h @@ -117,17 +117,6 @@ extern "C" { #endif /* __cplusplus */ -/* FIXME: For SDL 2.1, adjust all the magnitude variables to be Uint16 (0xFFFF). - * - * At the moment the magnitude variables are mixed between signed/unsigned, and - * it is also not made clear that ALL of those variables expect a max of 0x7FFF. - * - * Some platforms may have higher precision than that (Linux FF, Windows XInput) - * so we should fix the inconsistency in favor of higher possible precision, - * adjusting for platforms that use different scales. - * -flibit - */ - /** * \typedef SDL_Haptic * @@ -667,8 +656,8 @@ typedef struct SDL_HapticRamp * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect. * * The Left/Right effect is used to explicitly control the large and small - * motors, commonly found in modern game controllers. The small (right) motor - * is high frequency, and the large (left) motor is low frequency. + * motors, commonly found in modern game controllers. One motor is high + * frequency, the other is low frequency. * * \sa SDL_HAPTIC_LEFTRIGHT * \sa SDL_HapticEffect @@ -679,7 +668,7 @@ typedef struct SDL_HapticLeftRight Uint16 type; /**< ::SDL_HAPTIC_LEFTRIGHT */ /* Replay */ - Uint32 length; /**< Duration of the effect in milliseconds. */ + Uint32 length; /**< Duration of the effect. */ /* Rumble */ Uint16 large_magnitude; /**< Control of the large controller motor. */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h index 4ee72e97..3834640f 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -262,16 +262,6 @@ extern "C" { */ #define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" -/** - * \brief A variable setting the double click time, in milliseconds. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" - -/** - * \brief A variable setting the double click radius, in pixels. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" - /** * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode */ @@ -339,7 +329,7 @@ extern "C" { #define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" /** - * \brief A variable controlling which orientations are allowed on iOS/Android. + * \brief A variable controlling which orientations are allowed on iOS. * * In some circumstances it is necessary to be able to explicitly control * which UI orientations are allowed. @@ -475,88 +465,6 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS" -/** - * \brief A variable controlling whether the HIDAPI joystick drivers should be used. - * - * This variable can be set to the following values: - * "0" - HIDAPI drivers are not used - * "1" - HIDAPI drivers are used (the default) - * - * This variable is the default for all drivers, but can be overridden by the hints for specific drivers below. - */ -#define SDL_HINT_JOYSTICK_HIDAPI "SDL_JOYSTICK_HIDAPI" - -/** - * \brief A variable controlling whether the HIDAPI driver for PS4 controllers should be used. - * - * This variable can be set to the following values: - * "0" - HIDAPI driver is not used - * "1" - HIDAPI driver is used - * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI - */ -#define SDL_HINT_JOYSTICK_HIDAPI_PS4 "SDL_JOYSTICK_HIDAPI_PS4" - -/** - * \brief A variable controlling whether extended input reports should be used for PS4 controllers when using the HIDAPI driver. - * - * This variable can be set to the following values: - * "0" - extended reports are not enabled (the default) - * "1" - extended reports - * - * Extended input reports allow rumble on Bluetooth PS4 controllers, but - * break DirectInput handling for applications that don't use SDL. - * - * Once extended reports are enabled, they can not be disabled without - * power cycling the controller. - */ -#define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE" - -/** - * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. - * - * This variable can be set to the following values: - * "0" - HIDAPI driver is not used - * "1" - HIDAPI driver is used - * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI - */ -#define SDL_HINT_JOYSTICK_HIDAPI_STEAM "SDL_JOYSTICK_HIDAPI_STEAM" - -/** - * \brief A variable controlling whether the HIDAPI driver for Nintendo Switch controllers should be used. - * - * This variable can be set to the following values: - * "0" - HIDAPI driver is not used - * "1" - HIDAPI driver is used - * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI - */ -#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH" - -/** - * \brief A variable controlling whether the HIDAPI driver for XBox controllers should be used. - * - * This variable can be set to the following values: - * "0" - HIDAPI driver is not used - * "1" - HIDAPI driver is used - * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI - */ -#define SDL_HINT_JOYSTICK_HIDAPI_XBOX "SDL_JOYSTICK_HIDAPI_XBOX" - -/** - * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs - * - * The variable can be set to the following values: - * "0" - Do not scan for Steam Controllers - * "1" - Scan for Steam Controllers (the default) - * - * The default value is "1". This hint must be set before initializing the joystick subsystem. - */ -#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" - - /** * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. * This is a debugging aid for developers and not expected to be used by end users. The default is "1" @@ -619,10 +527,6 @@ extern "C" { * This is specially useful if you build SDL against a non glibc libc library (such as musl) which * provides a relatively small default thread stack size (a few kilobytes versus the default 8MB glibc uses). * Support for this hint is currently available only in the pthread, Windows, and PSP backend. -* -* Instead of this hint, in 2.0.9 and later, you can use -* SDL_CreateThreadWithStackSize(). This hint only works with the classic -* SDL_CreateThread(). */ #define SDL_HINT_THREAD_STACK_SIZE "SDL_THREAD_STACK_SIZE" @@ -848,23 +752,6 @@ extern "C" { */ #define SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH "SDL_ANDROID_SEPARATE_MOUSE_AND_TOUCH" - /** - * \brief A variable to control whether we trap the Android back button to handle it manually. - * This is necessary for the right mouse button to work on some Android devices, or - * to be able to trap the back button for use in your code reliably. If set to true, - * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of - * SDL_SCANCODE_AC_BACK. - * - * The variable can be set to the following values: - * "0" - Back button will be handled as usual for system. (default) - * "1" - Back button will be trapped, allowing you to handle the key press - * manually. (This will also let right mouse click work on systems - * where the right mouse button functions as back.) - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" - /** * \brief A variable to control whether the return key on the soft keyboard * should hide the soft keyboard on Android and iOS. diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h index 6e05a9c2..f67772d7 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h @@ -97,10 +97,10 @@ typedef enum typedef enum { SDL_JOYSTICK_POWER_UNKNOWN = -1, - SDL_JOYSTICK_POWER_EMPTY, /* <= 5% */ - SDL_JOYSTICK_POWER_LOW, /* <= 20% */ - SDL_JOYSTICK_POWER_MEDIUM, /* <= 70% */ - SDL_JOYSTICK_POWER_FULL, /* <= 100% */ + SDL_JOYSTICK_POWER_EMPTY, + SDL_JOYSTICK_POWER_LOW, + SDL_JOYSTICK_POWER_MEDIUM, + SDL_JOYSTICK_POWER_FULL, SDL_JOYSTICK_POWER_WIRED, SDL_JOYSTICK_POWER_MAX } SDL_JoystickPowerLevel; @@ -132,12 +132,6 @@ extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); */ extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); -/** - * Get the player index of a joystick, or -1 if it's not available - * This can be called before any joysticks are opened. - */ -extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index); - /** * Return the GUID for the joystick at this index * This can be called before any joysticks are opened. @@ -200,13 +194,6 @@ extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID */ extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); -/** - * Get the player index of an opened joystick, or -1 if it's not available - * - * For XInput controllers this returns the XInput user index. - */ -extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick); - /** * Return the GUID for this opened joystick */ @@ -374,19 +361,6 @@ extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, int button); -/** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. - * - * \param joystick The joystick to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds - * - * \return 0, or -1 if rumble isn't supported on this joystick - */ -extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); - /** * Close a joystick previously opened with SDL_JoystickOpen(). */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h index 92fbe67b..dbe9b97d 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-12373:8feb5da6f2fb" -#define SDL_REVISION_NUMBER 12373 +#define SDL_REVISION "hg-11914:f1084c419f33" +#define SDL_REVISION_NUMBER 11914 diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h deleted file mode 100644 index ac163a8c..00000000 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_sensor.h +++ /dev/null @@ -1,251 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2018 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_sensor.h - * - * Include file for SDL sensor event handling - * - */ - -#ifndef _SDL_sensor_h -#define _SDL_sensor_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \brief SDL_sensor.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_SENSOR flag. This causes SDL to scan the system - * for sensors, and load appropriate drivers. - */ - -struct _SDL_Sensor; -typedef struct _SDL_Sensor SDL_Sensor; - -/** - * This is a unique ID for a sensor for the time it is connected to the system, - * and is never reused for the lifetime of the application. - * - * The ID value starts at 0 and increments from there. The value -1 is an invalid ID. - */ -typedef Sint32 SDL_SensorID; - -/* The different sensors defined by SDL - * - * Additional sensors may be available, using platform dependent semantics. - * - * Hare are the additional Android sensors: - * https://developer.android.com/reference/android/hardware/SensorEvent.html#values - */ -typedef enum -{ - SDL_SENSOR_INVALID = -1, /**< Returned for an invalid sensor */ - SDL_SENSOR_UNKNOWN, /**< Unknown sensor type */ - SDL_SENSOR_ACCEL, /**< Accelerometer */ - SDL_SENSOR_GYRO /**< Gyroscope */ -} SDL_SensorType; - -/** - * Accelerometer sensor - * - * The accelerometer returns the current acceleration in SI meters per - * second squared. This includes gravity, so a device at rest will have - * an acceleration of SDL_STANDARD_GRAVITY straight down. - * - * values[0]: Acceleration on the x axis - * values[1]: Acceleration on the y axis - * values[2]: Acceleration on the z axis - * - * For phones held in portrait mode, the axes are defined as follows: - * -X ... +X : left ... right - * -Y ... +Y : bottom ... top - * -Z ... +Z : farther ... closer - * - * The axis data is not changed when the phone is rotated. - * - * \sa SDL_GetDisplayOrientation() - */ -#define SDL_STANDARD_GRAVITY 9.80665f - -/** - * Gyroscope sensor - * - * The gyroscope returns the current rate of rotation in radians per second. - * The rotation is positive in the counter-clockwise direction. That is, - * an observer looking from a positive location on one of the axes would - * see positive rotation on that axis when it appeared to be rotating - * counter-clockwise. - * - * values[0]: Angular speed around the x axis - * values[1]: Angular speed around the y axis - * values[2]: Angular speed around the z axis - * - * For phones held in portrait mode, the axes are defined as follows: - * -X ... +X : left ... right - * -Y ... +Y : bottom ... top - * -Z ... +Z : farther ... closer - * - * The axis data is not changed when the phone is rotated. - * - * \sa SDL_GetDisplayOrientation() - */ - -/* Function prototypes */ - -/** - * \brief Count the number of sensors attached to the system right now - */ -extern DECLSPEC int SDLCALL SDL_NumSensors(void); - -/** - * \brief Get the implementation dependent name of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor name, or NULL if device_index is out of range. - */ -extern DECLSPEC const char *SDLCALL SDL_SensorGetDeviceName(int device_index); - -/** - * \brief Get the type of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor type, or SDL_SENSOR_INVALID if device_index is out of range. - */ -extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetDeviceType(int device_index); - -/** - * \brief Get the platform dependent type of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor platform dependent type, or -1 if device_index is out of range. - */ -extern DECLSPEC int SDLCALL SDL_SensorGetDeviceNonPortableType(int device_index); - -/** - * \brief Get the instance ID of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor instance ID, or -1 if device_index is out of range. - */ -extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetDeviceInstanceID(int device_index); - -/** - * \brief Open a sensor for use. - * - * The index passed as an argument refers to the N'th sensor on the system. - * - * \return A sensor identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorOpen(int device_index); - -/** - * Return the SDL_Sensor associated with an instance id. - */ -extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorFromInstanceID(SDL_SensorID instance_id); - -/** - * \brief Get the implementation dependent name of a sensor. - * - * \return The sensor name, or NULL if the sensor is NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_SensorGetName(SDL_Sensor *sensor); - -/** - * \brief Get the type of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor type, or SDL_SENSOR_INVALID if the sensor is NULL. - */ -extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetType(SDL_Sensor *sensor); - -/** - * \brief Get the platform dependent type of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor platform dependent type, or -1 if the sensor is NULL. - */ -extern DECLSPEC int SDLCALL SDL_SensorGetNonPortableType(SDL_Sensor *sensor); - -/** - * \brief Get the instance ID of a sensor. - * - * This can be called before any sensors are opened. - * - * \return The sensor instance ID, or -1 if the sensor is NULL. - */ -extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetInstanceID(SDL_Sensor *sensor); - -/** - * Get the current state of an opened sensor. - * - * The number of values and interpretation of the data is sensor dependent. - * - * \param sensor The sensor to query - * \param data A pointer filled with the current sensor state - * \param num_values The number of values to write to data - * - * \return 0 or -1 if an error occurred. - */ -extern DECLSPEC int SDLCALL SDL_SensorGetData(SDL_Sensor * sensor, float *data, int num_values); - -/** - * Close a sensor previously opened with SDL_SensorOpen() - */ -extern DECLSPEC void SDLCALL SDL_SensorClose(SDL_Sensor * sensor); - -/** - * Update the current state of the open sensors. - * - * This is called automatically by the event loop if sensor events are enabled. - * - * This needs to be called from the thread that initialized the sensor subsystem. - */ -extern DECLSPEC void SDLCALL SDL_SensorUpdate(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_sensor_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h index e373bc38..111a0645 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -86,28 +86,6 @@ #ifdef HAVE_FLOAT_H # include #endif -#if defined(HAVE_ALLOCA) && !defined(alloca) -# if defined(HAVE_ALLOCA_H) -# include -# elif defined(__GNUC__) -# define alloca __builtin_alloca -# elif defined(_MSC_VER) -# include -# define alloca _alloca -# elif defined(__WATCOMC__) -# include -# elif defined(__BORLANDC__) -# include -# elif defined(__DMC__) -# include -# elif defined(__AIX__) -#pragma alloca -# elif defined(__MRC__) -void *alloca(unsigned); -# else -char *alloca(); -# endif -#endif /** * The number of elements in an array. @@ -350,6 +328,28 @@ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); extern "C" { #endif +#if defined(HAVE_ALLOCA) && !defined(alloca) +# if defined(HAVE_ALLOCA_H) +# include +# elif defined(__GNUC__) +# define alloca __builtin_alloca +# elif defined(_MSC_VER) +# include +# define alloca _alloca +# elif defined(__WATCOMC__) +# include +# elif defined(__BORLANDC__) +# include +# elif defined(__DMC__) +# include +# elif defined(__AIX__) +#pragma alloca +# elif defined(__MRC__) +void *alloca(unsigned); +# else +char *alloca(); +# endif +#endif #ifdef HAVE_ALLOCA #define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count)) #define SDL_stack_free(data) @@ -445,12 +445,12 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) #endif } + extern DECLSPEC void *SDLCALL SDL_memcpy(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); -extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); @@ -514,8 +514,6 @@ extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); extern DECLSPEC float SDLCALL SDL_copysignf(float x, float y); extern DECLSPEC double SDLCALL SDL_cos(double x); extern DECLSPEC float SDLCALL SDL_cosf(float x); -extern DECLSPEC double SDLCALL SDL_exp(double x); -extern DECLSPEC float SDLCALL SDL_expf(float x); extern DECLSPEC double SDLCALL SDL_fabs(double x); extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h index 730d49fc..45e5366f 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h @@ -248,13 +248,6 @@ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key); -/** - * \brief Returns whether the surface has a color key - * - * \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface); - /** * \brief Gets the color key (transparent pixel) in a blittable surface. * diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h index 4dc372d6..7b776fdf 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -76,18 +76,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a #endif /* __WIN32__ */ -/* Platform specific functions for Linux */ -#ifdef __LINUX__ - -/** - \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available. - - \return 0 on success, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority); - -#endif /* __LINUX__ */ - /* Platform specific functions for iOS */ #if defined(__IPHONEOS__) && __IPHONEOS__ @@ -125,21 +113,6 @@ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); */ extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); -/** - \brief Return true if the application is running on a Chromebook - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsChromebook(void); - -/** - \brief Return true is the application is running on a Samsung DeX docking station - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsDeXMode(void); - -/** - \brief Trigger the Android system back button behavior. - */ -extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); - /** See the official Android developer guide for more information: http://developer.android.com/guide/topics/data/data-storage.html @@ -263,11 +236,6 @@ extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); #endif /* __WINRT__ */ -/** - \brief Return true if the current device is a tablet. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsTablet(void); - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h index f1c4021c..8aa4a39e 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h @@ -33,6 +33,12 @@ #include "SDL_video.h" #include "SDL_version.h" +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + /** * \file SDL_syswm.h * @@ -104,12 +110,6 @@ typedef void *EGLSurface; #include "SDL_egl.h" #endif -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - /** * These are the various supported windowing subsystems */ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h index 554dd0b6..82a43fc0 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h @@ -54,13 +54,12 @@ typedef unsigned int SDL_TLSID; /** * The SDL thread priority. * - * \note On many systems you require special privileges to set high or time critical priority. + * \note On many systems you require special privileges to set high priority. */ typedef enum { SDL_THREAD_PRIORITY_LOW, SDL_THREAD_PRIORITY_NORMAL, - SDL_THREAD_PRIORITY_HIGH, - SDL_THREAD_PRIORITY_TIME_CRITICAL + SDL_THREAD_PRIORITY_HIGH } SDL_ThreadPriority; /** @@ -106,24 +105,14 @@ SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), - const char *name, const size_t stacksize, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); - - /** * Create a thread. */ #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread #define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) #else #define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) #endif #elif defined(__OS2__) @@ -143,31 +132,15 @@ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread #define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) -#undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) #else #define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) #endif #else -/** - * Create a thread with a default stack size. - * - * This is equivalent to calling: - * SDL_CreateThreadWithStackSize(fn, name, 0, data); - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); - /** * Create a thread. * @@ -185,17 +158,9 @@ SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); * If a system imposes requirements, SDL will try to munge the string for * it (truncate, etc), but the original string contents will be available * from SDL_GetThreadName(). - * - * The size (in bytes) of the new stack can be specified. Zero means "use - * the system default" which might be wildly different between platforms - * (x86 Linux generally defaults to eight megabytes, an embedded device - * might be a few kilobytes instead). - * - * In SDL 2.1, stacksize will be folded into the original SDL_CreateThread - * function. */ extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data); +SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); #endif diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h index 31443e14..584b48c7 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 9 +#define SDL_PATCHLEVEL 8 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h index 461f1380..83f49faa 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h @@ -169,24 +169,6 @@ typedef enum SDL_WINDOWEVENT_HIT_TEST /**< Window had a hit test that wasn't SDL_HITTEST_NORMAL. */ } SDL_WindowEventID; -/** - * \brief Event subtype for display events - */ -typedef enum -{ - SDL_DISPLAYEVENT_NONE, /**< Never used */ - SDL_DISPLAYEVENT_ORIENTATION /**< Display orientation has changed to data1 */ -} SDL_DisplayEventID; - -typedef enum -{ - SDL_ORIENTATION_UNKNOWN, /**< The display orientation can't be determined */ - SDL_ORIENTATION_LANDSCAPE, /**< The display is in landscape mode, with the right side up, relative to portrait mode */ - SDL_ORIENTATION_LANDSCAPE_FLIPPED, /**< The display is in landscape mode, with the left side up, relative to portrait mode */ - SDL_ORIENTATION_PORTRAIT, /**< The display is in portrait mode */ - SDL_ORIENTATION_PORTRAIT_FLIPPED /**< The display is in portrait mode, upside down */ -} SDL_DisplayOrientation; - /** * \brief An opaque handle to an OpenGL context. */ @@ -334,6 +316,18 @@ extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); */ extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); +/** + * \brief Get the dots/pixels-per-inch for a display + * + * \note Diagonal, horizontal and vertical DPI can all be optionally + * returned if the parameter is non-NULL. + * + * \return 0 on success, or -1 if no DPI information is available or the index is out of range. + * + * \sa SDL_GetNumVideoDisplays() + */ +extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi); + /** * \brief Get the usable desktop area represented by a display, with the * primary display located at 0,0 @@ -353,27 +347,6 @@ extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * re */ extern DECLSPEC int SDLCALL SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect); -/** - * \brief Get the dots/pixels-per-inch for a display - * - * \note Diagonal, horizontal and vertical DPI can all be optionally - * returned if the parameter is non-NULL. - * - * \return 0 on success, or -1 if no DPI information is available or the index is out of range. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi); - -/** - * \brief Get the orientation of a display - * - * \return The orientation of the display, or SDL_ORIENTATION_UNKNOWN if it isn't available. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC SDL_DisplayOrientation SDLCALL SDL_GetDisplayOrientation(int displayIndex); - /** * \brief Returns the number of available display modes. * diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h index 972cca4d..f04c21ad 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h @@ -135,11 +135,11 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); * \brief Get the names of the Vulkan instance extensions needed to create * a surface with \c SDL_Vulkan_CreateSurface(). * - * \param [in] \c NULL or window Window for which the required Vulkan instance + * \param [in] window Window for which the required Vulkan instance * extensions should be retrieved - * \param [in,out] pCount pointer to an \c unsigned related to the number of + * \param [in,out] count pointer to an \c unsigned related to the number of * required Vulkan instance extensions - * \param [out] pNames \c NULL or a pointer to an array to be filled with the + * \param [out] names \c NULL or a pointer to an array to be filled with the * required Vulkan instance extensions * * \return \c SDL_TRUE on success, \c SDL_FALSE on error. @@ -153,10 +153,6 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); * is smaller than the number of required extensions, \c SDL_FALSE will be * returned instead of \c SDL_TRUE, to indicate that not all the required * extensions were returned. - * - * \note If \c window is not NULL, it will be checked against its creation - * flags to ensure that the Vulkan flag is present. This parameter - * will be removed in a future major release. * * \note The returned list of extensions will contain \c VK_KHR_surface * and zero or more platform specific extensions @@ -164,13 +160,12 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); * \note The extension names queried here must be enabled when calling * VkCreateInstance, otherwise surface creation will fail. * - * \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag - * or be \c NULL + * \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag. * * \code * unsigned int count; * // get count of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL)) + * if(!SDL_Vulkan_GetInstanceExtensions(window, &count, NULL)) * handle_error(); * * static const char *const additionalExtensions[] = @@ -184,7 +179,7 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); * handle_error(); * * // get names of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names)) + * if(!SDL_Vulkan_GetInstanceExtensions(window, &count, names)) * handle_error(); * * // copy additional extensions after required extensions diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist index 09899c57..14fd0440 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 17G65 + 17C88 CFBundleDevelopmentRegion English CFBundleExecutable @@ -19,7 +19,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.9 + 2.0.8 CFBundleSignature SDLX CFBundleSupportedPlatforms @@ -27,20 +27,20 @@ MacOSX CFBundleVersion - 2.0.9 + 2.0.8 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 10A255 + 9C40b DTPlatformVersion GM DTSDKBuild - 18A384 + 17C76 DTSDKName - macosx10.14 + macosx10.13 DTXcode - 1000 + 0920 DTXcodeBuild - 10A255 + 9C40b diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 b/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 index fb3bb743..36a762e5 100755 Binary files a/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 and b/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 differ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources index ed716bcf..02ad89ac 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Resources/Info.plist - 9T9CEY/GHPLMV398Cx2OUWe8MVI= + dts8ape5zBg3+8u8BQ5kWqp9cC8= files2 @@ -15,11 +15,11 @@ hash - 49nvc7QToCAQLOuQYg5d779VW3g= + wiqwnVgtbgjGPAOFejxz8yw7geU= hash2 - NLgB0IPWGKfeYCtUqAAuK70AxrNGD5IUCdRh2wM0+VU= + LLwzMAHn2OsCr2SVR7M71KeQf+TiJpHk/KKojzQdRlI= Headers/SDL_assert.h @@ -48,11 +48,11 @@ hash - bCT1aBK06cMR6XwF8XLvtevSVAY= + 9uJv81fH9Op/f3sF7/GVuNYQNOc= hash2 - 38oQKCI+MpwiSgdqg/YUBSB6cfzpXXnqv4oPEScXDDM= + KDokTSV3kZuHCQFFrRum3VoTP1QSW2xAghjceoIArXY= Headers/SDL_bits.h @@ -92,22 +92,22 @@ hash - d/fShSScdM47JT6zVSrfULAMtpk= + nJnfliCMDJUfOG8t4QYt5U9tFBY= hash2 - hqFomi7gM/LXRjuRae5d3D/SKLBKmrPAp6TgW+OdkVg= + qkVvxnI+XRMTIdbzQ9tV+ERRc75r/EzWu0qRTgt5K5c= Headers/SDL_config_macosx.h hash - H0+NaeWz7cJLtW/LjkuWlCT2/oE= + D0LXp0FibaaLSE6877hbyqf2Jb8= hash2 - skiBjJo1Yq2nen+FcO3Pxy4PjWbcUdDKF8p72tPBrpw= + pCQLXwJ6HaGZiG5vr9njJtgNcIV9p0mxcSJtYoj147A= Headers/SDL_copying.h @@ -125,11 +125,11 @@ hash - Nw8KCHXkAAuqJAvJOv+SWhZGEhU= + 2wleDfJFmCBrEssrE9rcuaiqOLQ= hash2 - 0eRfEAH+V/dL+6GHKmkbzcmeR9nISfmjBGcoOn8J9J8= + MEpF0mFQFLhuTV+5uSB++q8tT2z5heESxyP1HuzuKxc= Headers/SDL_endian.h @@ -158,11 +158,11 @@ hash - szOypQL+tBWkumW9xkwm5kpiGCE= + ptgRA0IBsCg5za/lwhTOPGNmekY= hash2 - Iz2fuclzBbpDLa+Dq/Eq8MupiacS6vcB2AWrbvzWinM= + lwISPqzee6nV4HCHaMzZCVJJAtFZmoi8cYlJkY41wKA= Headers/SDL_filesystem.h @@ -180,11 +180,11 @@ hash - Y46TpYRoYCHK4qV9HMp76Vj6jB8= + sUaSBwOprX7A696W6u2oOtIne+Y= hash2 - 5cmyPcoPpG+9ZJCq4n1GsKirMlwU1NNi0dLGL7qH6qI= + VZDstHk/V+tZik3q3xnDCAG3AfA+BoHk9lB406mKtxU= Headers/SDL_gesture.h @@ -202,33 +202,33 @@ hash - aNb86XMA8j7OVT9j3ReBkzfOvzI= + 95rNclZzbsuV6pyeG8cbIETgS84= hash2 - 8QEdekDVr5cLtobUqsj19TtgOspGlP/2vlVCx1L+xcs= + O4RUmC9HMqsjAf22Ru6z5j9HaYTsc7SxOnzOXPR3kz0= Headers/SDL_hints.h hash - wO6x0FskYQ3YXeNo8nC4fUuwVF0= + UjEgXfZiLUmQTh9G+Bkx8Y1Ov6k= hash2 - 6V1lCUmwIWOAqq2OQ23J1/VhfbzwDnlQZPWTlhojfa4= + DqFPmBXNg9BovdIAlipnBKZo5mcQJCrLmhyIM/O+tvU= Headers/SDL_joystick.h hash - iMGs3U89FHkp1B8fAL14WyLC4Is= + 97SJSCx+xjRHUQ6ilndhP8TZ110= hash2 - bUyUDarySk37tfBr5tn+rYVIboNQ8aSXAujz55F6HZo= + xYWL+BS5f9NGr7eeP+vL0kD5K6O99PXgOWLT2Bx2dRQ= Headers/SDL_keyboard.h @@ -488,11 +488,11 @@ hash - iqk1rcUDgD5P8OLxU0Th5/CiMj4= + XBn2NI8Qm53MeZGaXVB3fQrs0uc= hash2 - OZ2Wpu4gD0awLDJjvvgNsprV5SWRjeInUiyJIoUz5F8= + FHG6Lqi1wMmjow+JjxKYy/LAoqP+iDH8QYuJS1zr6T4= Headers/SDL_rwops.h @@ -517,17 +517,6 @@ 5VaZC9IfMuNgz3h6OJn9Q/IGB/+cpymxIrjkluCWzOo= - Headers/SDL_sensor.h - - hash - - Be7Gy5/r1i7xekMvnpx2rligsYU= - - hash2 - - E/d0hIQ2nn69Cryv+nT2Hr+JmWa2ETnsBgE/JpJ36uc= - - Headers/SDL_shape.h hash @@ -543,55 +532,55 @@ hash - Z0uzAbGiXidgebOz6idDVTr7qtc= + qBTB0Yqh+34vD3n3dN9ry9GwqJM= hash2 - JMXREkpaKMdzh4IgZzSHyp5vbIaa3IjvgFjfUzDN6Y4= + TDMriI0PPYF73lvh6suExzpMldCmX1SkLgg+wkBqt7A= Headers/SDL_surface.h hash - xCVDDdRmW3XjJfDaMiKm/c9oQlM= + bssTKTIF4Yw/3a6fyF7GhaVrdU0= hash2 - IzrFWzZUTMjqUmCN5fCPOQuJuhE5P0NMUWtqfHJGWz4= + zRF/b8bCqjClZnbPorqjhlWw9aujM9RwnVemHyiC2yM= Headers/SDL_system.h hash - gfiAZLnsMKtcBY30ygv+FLGYBeE= + n2WodCV+WpbfpFSKUUKpB/i5ZPw= hash2 - 8mRRFbV80FDAFMhJcJBBLuMOEzRZlaK9BaFNLvaZdFQ= + 3W0Z/Fdwbc7dTyR+v4g6eVE58XcEYLTzDGO+RMwcmJc= Headers/SDL_syswm.h hash - lBCQTJ7UvTA5qYKTiEpsqFTGXHo= + QoebSqgb1XslKPBwMiUOM6daVKo= hash2 - NVDqg+40pJZm/xBJTcr2sQFRQrov9a14KBJ07lfbwgs= + rCqmdvdibhT5MBOnvKCT0gK7Howb5uLewC321yLYr5U= Headers/SDL_thread.h hash - 6gQ6df2RG9ffNYRQj6PwIE732BE= + fXCWQD4MIniqvdB6pWVwlxNS9jk= hash2 - b7aDhH9W57nyn9u+xXrlA2kJVj91wFAAafUP07nphY0= + 18iJ1yFzOTeiM30JwK3GMlbgUqzNDIQiw3ZLLr3M+XQ= Headers/SDL_timer.h @@ -631,33 +620,33 @@ hash - n/L/bdSBJArMDPWwOU5CABfDXtE= + nKLee2vSNZZK9p94Up9o87OoiDE= hash2 - of5yxPHtdFdC8JwFB7ULi195Ws4KbiM1l/WjB8Y2Os8= + F3dpo9XlvebIS2NLJ1ovH+W7fG3bzb01F8OKUeqd+U0= Headers/SDL_video.h hash - DwvB/tKrFg/8GMK9DWe7RYPVCDo= + UFZPU1U3CDog3RBKdd5wu9LFQZk= hash2 - yBnTX5Y53PXTHttQX3YGhklBGQc/uUzL2ntHnjxM4DE= + 6/OCq92BIQnGHBLmlGX4nUNnfLM7LzPoMp+lPlYY4ew= Headers/SDL_vulkan.h hash - i1vRVTlmtbM2IJt9r8QO8MOL8eI= + eLdIezOR2pV1ai5rLBrtiR3NAok= hash2 - EKCF9MU8qtxJHzJRCp0Zk2krWF631/jBU58TFGyfxcw= + iCB8avj2P0+ZkjVGfTchu5BAd7BJ+LeC1fJ9BU+80IE= Headers/begin_code.h @@ -686,11 +675,11 @@ hash - 9T9CEY/GHPLMV398Cx2OUWe8MVI= + dts8ape5zBg3+8u8BQ5kWqp9cC8= hash2 - KFUbjOLL/X3D63G9bhiW/25JSbP/2fTNKCNFg1CxwJU= + ZCgx1szeVwObsPiq6VoZh8Q9ym7l+7WXzv0HTSoFT0U=