mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-03-06 17:01:39 +00:00
deps: update sdl2 to 2.32.2
This commit is contained in:
parent
1bc2e970ee
commit
50186a4812
8 changed files with 28 additions and 7 deletions
2
deps/sdl2/bin/sdl2-config
vendored
2
deps/sdl2/bin/sdl2-config
vendored
|
@ -43,7 +43,7 @@ while test $# -gt 0; do
|
||||||
echo $exec_prefix
|
echo $exec_prefix
|
||||||
;;
|
;;
|
||||||
--version)
|
--version)
|
||||||
echo 2.32.0
|
echo 2.32.2
|
||||||
;;
|
;;
|
||||||
--cflags)
|
--cflags)
|
||||||
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE
|
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE
|
||||||
|
|
21
deps/sdl2/include/SDL2/SDL_hints.h
vendored
21
deps/sdl2/include/SDL2/SDL_hints.h
vendored
|
@ -1423,6 +1423,27 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
#define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE"
|
#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'
|
* A variable controlling whether joysticks on Linux will always treat 'hat'
|
||||||
* axis inputs (ABS_HAT0X - ABS_HAT3Y) as 8-way digital hats without checking
|
* axis inputs (ABS_HAT0X - ABS_HAT3Y) as 8-way digital hats without checking
|
||||||
|
|
2
deps/sdl2/include/SDL2/SDL_keyboard.h
vendored
2
deps/sdl2/include/SDL2/SDL_keyboard.h
vendored
|
@ -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 some platforms using this function activates the screen keyboard.
|
||||||
*
|
*
|
||||||
* On desktop platforms, SDL_StartTextInput() is implicitly called on SDL
|
* 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.
|
* SDL_TextEditingEvent to begin emitting.
|
||||||
*
|
*
|
||||||
* \since This function is available since SDL 2.0.0.
|
* \since This function is available since SDL 2.0.0.
|
||||||
|
|
4
deps/sdl2/include/SDL2/SDL_revision.h
vendored
4
deps/sdl2/include/SDL2/SDL_revision.h
vendored
|
@ -2,7 +2,7 @@
|
||||||
#define SDL_REVISION_NUMBER 0
|
#define SDL_REVISION_NUMBER 0
|
||||||
|
|
||||||
#ifdef SDL_VENDOR_INFO
|
#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
|
#else
|
||||||
#define SDL_REVISION "SDL-release-2.32.0-0-g7a44b1ab0"
|
#define SDL_REVISION "SDL-release-2.32.2-0-ge11183ea6"
|
||||||
#endif
|
#endif
|
||||||
|
|
2
deps/sdl2/include/SDL2/SDL_version.h
vendored
2
deps/sdl2/include/SDL2/SDL_version.h
vendored
|
@ -58,7 +58,7 @@ typedef struct SDL_version
|
||||||
*/
|
*/
|
||||||
#define SDL_MAJOR_VERSION 2
|
#define SDL_MAJOR_VERSION 2
|
||||||
#define SDL_MINOR_VERSION 32
|
#define SDL_MINOR_VERSION 32
|
||||||
#define SDL_PATCHLEVEL 0
|
#define SDL_PATCHLEVEL 2
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Macro to determine SDL version program was compiled against.
|
* Macro to determine SDL version program was compiled against.
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# 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)
|
if (PACKAGE_FIND_VERSION_RANGE)
|
||||||
# Package version must be in the requested version range
|
# Package version must be in the requested version range
|
||||||
|
|
BIN
deps/sdl2/lib/libSDL2.a
vendored
BIN
deps/sdl2/lib/libSDL2.a
vendored
Binary file not shown.
2
deps/sdl2/lib/pkgconfig/sdl2.pc
vendored
2
deps/sdl2/lib/pkgconfig/sdl2.pc
vendored
|
@ -7,7 +7,7 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: sdl2
|
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.
|
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:
|
Requires.private:
|
||||||
Conflicts:
|
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
|
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
|
||||||
|
|
Loading…
Reference in a new issue