diff --git a/deps/sdl2/bin/sdl2-config b/deps/sdl2/bin/sdl2-config index 9c139bb6..8b8e0d4d 100755 --- a/deps/sdl2/bin/sdl2-config +++ b/deps/sdl2/bin/sdl2-config @@ -43,7 +43,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo 2.32.0 + echo 2.32.2 ;; --cflags) echo -I${prefix}/include/SDL2 -D_THREAD_SAFE diff --git a/deps/sdl2/include/SDL2/SDL_hints.h b/deps/sdl2/include/SDL2/SDL_hints.h index 4665107f..6713d01f 100644 --- a/deps/sdl2/include/SDL2/SDL_hints.h +++ b/deps/sdl2/include/SDL2/SDL_hints.h @@ -1423,6 +1423,27 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE" + +/** + * A variable containing a list of devices and their desired number of haptic + * (force feedback) enabled axis. + * + * The format of the string is a comma separated list of USB VID/PID pairs in + * hexadecimal form plus the number of desired axes, e.g. + * + * `0xAAAA/0xBBBB/1,0xCCCC/0xDDDD/3` + * + * This hint supports a "wildcard" device that will set the number of haptic + * axes on all initialized haptic devices which were not defined explicitly in + * this hint. + * + * `0xFFFF/0xFFFF/1` + * + * This hint should be set before a controller is opened. The number of haptic + * axes won't exceed the number of real axes found on the device. + */ +#define SDL_HINT_JOYSTICK_HAPTIC_AXES "SDL_JOYSTICK_HAPTIC_AXES" + /** * A variable controlling whether joysticks on Linux will always treat 'hat' * axis inputs (ABS_HAT0X - ABS_HAT3Y) as 8-way digital hats without checking diff --git a/deps/sdl2/include/SDL2/SDL_keyboard.h b/deps/sdl2/include/SDL2/SDL_keyboard.h index 8c4efdd0..62ac9f22 100644 --- a/deps/sdl2/include/SDL2/SDL_keyboard.h +++ b/deps/sdl2/include/SDL2/SDL_keyboard.h @@ -255,7 +255,7 @@ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); * On some platforms using this function activates the screen keyboard. * * On desktop platforms, SDL_StartTextInput() is implicitly called on SDL - * window creation which will cause events SDL_TextInputEvent and + * video subsystem initialization which will cause SDL_TextInputEvent and * SDL_TextEditingEvent to begin emitting. * * \since This function is available since SDL 2.0.0. diff --git a/deps/sdl2/include/SDL2/SDL_revision.h b/deps/sdl2/include/SDL2/SDL_revision.h index 073d8ef8..d0ec0cfc 100644 --- a/deps/sdl2/include/SDL2/SDL_revision.h +++ b/deps/sdl2/include/SDL2/SDL_revision.h @@ -2,7 +2,7 @@ #define SDL_REVISION_NUMBER 0 #ifdef SDL_VENDOR_INFO -#define SDL_REVISION "SDL-release-2.32.0-0-g7a44b1ab0 (" SDL_VENDOR_INFO ")" +#define SDL_REVISION "SDL-release-2.32.2-0-ge11183ea6 (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "SDL-release-2.32.0-0-g7a44b1ab0" +#define SDL_REVISION "SDL-release-2.32.2-0-ge11183ea6" #endif diff --git a/deps/sdl2/include/SDL2/SDL_version.h b/deps/sdl2/include/SDL2/SDL_version.h index 32d1133b..04650207 100644 --- a/deps/sdl2/include/SDL2/SDL_version.h +++ b/deps/sdl2/include/SDL2/SDL_version.h @@ -58,7 +58,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 32 -#define SDL_PATCHLEVEL 0 +#define SDL_PATCHLEVEL 2 /** * Macro to determine SDL version program was compiled against. diff --git a/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake b/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake index 493efeaa..3d75e889 100644 --- a/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake +++ b/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake @@ -7,7 +7,7 @@ # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.32.0") +set(PACKAGE_VERSION "2.32.2") if (PACKAGE_FIND_VERSION_RANGE) # Package version must be in the requested version range diff --git a/deps/sdl2/lib/libSDL2.a b/deps/sdl2/lib/libSDL2.a index 7af8827b..9cfcc9d4 100644 Binary files a/deps/sdl2/lib/libSDL2.a and b/deps/sdl2/lib/libSDL2.a differ diff --git a/deps/sdl2/lib/pkgconfig/sdl2.pc b/deps/sdl2/lib/pkgconfig/sdl2.pc index 1000cb42..fc8d112e 100644 --- a/deps/sdl2/lib/pkgconfig/sdl2.pc +++ b/deps/sdl2/lib/pkgconfig/sdl2.pc @@ -7,7 +7,7 @@ includedir=${prefix}/include Name: sdl2 Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. -Version: 2.32.0 +Version: 2.32.2 Requires.private: Conflicts: Libs: -L${libdir} -lSDL2 -lm -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,IOKit -Wl,-framework,ForceFeedback -Wl,-framework,Carbon -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AVFoundation -Wl,-framework,Foundation -Wl,-weak_framework,GameController -Wl,-weak_framework,Metal -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,CoreHaptics