mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-22 03:51:33 +00:00
deps: update sdl2 to 2.30.5
This commit is contained in:
parent
6f99c7da35
commit
ca01d4e45c
8 changed files with 29 additions and 12 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.30.4
|
echo 2.30.5
|
||||||
;;
|
;;
|
||||||
--cflags)
|
--cflags)
|
||||||
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE
|
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE
|
||||||
|
|
14
deps/sdl2/include/SDL2/SDL_hints.h
vendored
14
deps/sdl2/include/SDL2/SDL_hints.h
vendored
|
@ -1424,7 +1424,19 @@ extern "C" {
|
||||||
#define SDL_HINT_MOUSE_RELATIVE_WARP_MOTION "SDL_MOUSE_RELATIVE_WARP_MOTION"
|
#define SDL_HINT_MOUSE_RELATIVE_WARP_MOTION "SDL_MOUSE_RELATIVE_WARP_MOTION"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief A variable controlling whether mouse events should generate synthetic touch events
|
* \brief A variable controlling whether the hardware cursor stays visible when relative mode is active.
|
||||||
|
*
|
||||||
|
* This variable can be set to the following values:
|
||||||
|
* "0" - The cursor will be hidden while relative mode is active (default)
|
||||||
|
* "1" - The cursor will remain visible while relative mode is active
|
||||||
|
*
|
||||||
|
* Note that for systems without raw hardware inputs, relative mode is implemented using warping, so the hardware cursor will visibly warp between frames if this is enabled on those systems.
|
||||||
|
*/
|
||||||
|
#define SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE "SDL_MOUSE_RELATIVE_CURSOR_VISIBLE"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A variable controlling whether mouse events should generate synthetic touch
|
||||||
|
* events
|
||||||
*
|
*
|
||||||
* This variable can be set to the following values:
|
* This variable can be set to the following values:
|
||||||
* "0" - Mouse events will not generate touch events (default for desktop platforms)
|
* "0" - Mouse events will not generate touch events (default for desktop platforms)
|
||||||
|
|
15
deps/sdl2/include/SDL2/SDL_joystick.h
vendored
15
deps/sdl2/include/SDL2/SDL_joystick.h
vendored
|
@ -790,12 +790,17 @@ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
|
||||||
* **WARNING**: Calling this function may delete all events currently in SDL's
|
* **WARNING**: Calling this function may delete all events currently in SDL's
|
||||||
* event queue.
|
* event queue.
|
||||||
*
|
*
|
||||||
* \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
|
* While `param` is meant to be one of `SDL_QUERY`, `SDL_IGNORE`, or
|
||||||
* \returns 1 if enabled, 0 if disabled, or a negative error code on failure;
|
* `SDL_ENABLE`, this function accepts any value, with any non-zero value that
|
||||||
* call SDL_GetError() for more information.
|
* isn't `SDL_QUERY` being treated as `SDL_ENABLE`.
|
||||||
*
|
*
|
||||||
* If `state` is `SDL_QUERY` then the current state is returned,
|
* If SDL was built with events disabled (extremely uncommon!), this will
|
||||||
* otherwise the new processing state is returned.
|
* do nothing and always return `SDL_IGNORE`.
|
||||||
|
*
|
||||||
|
* \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
|
||||||
|
* \returns If `state` is `SDL_QUERY` then the current state is returned,
|
||||||
|
* otherwise `state` is returned (even if it was not one of the
|
||||||
|
* allowed values).
|
||||||
*
|
*
|
||||||
* \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.30.4-0-g92fe3b19c (" SDL_VENDOR_INFO ")"
|
#define SDL_REVISION "SDL-release-2.30.5-0-g2eef7ca47 (" SDL_VENDOR_INFO ")"
|
||||||
#else
|
#else
|
||||||
#define SDL_REVISION "SDL-release-2.30.4-0-g92fe3b19c"
|
#define SDL_REVISION "SDL-release-2.30.5-0-g2eef7ca47"
|
||||||
#endif
|
#endif
|
||||||
|
|
2
deps/sdl2/include/SDL2/SDL_version.h
vendored
2
deps/sdl2/include/SDL2/SDL_version.h
vendored
|
@ -59,7 +59,7 @@ typedef struct SDL_version
|
||||||
*/
|
*/
|
||||||
#define SDL_MAJOR_VERSION 2
|
#define SDL_MAJOR_VERSION 2
|
||||||
#define SDL_MINOR_VERSION 30
|
#define SDL_MINOR_VERSION 30
|
||||||
#define SDL_PATCHLEVEL 4
|
#define SDL_PATCHLEVEL 5
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.30.4")
|
set(PACKAGE_VERSION "2.30.5")
|
||||||
|
|
||||||
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.30.4
|
Version: 2.30.5
|
||||||
Requires.private:
|
Requires.private:
|
||||||
Conflicts:
|
Conflicts:
|
||||||
Libs: -L${libdir} -lSDL2 -lSDL2 -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 -lm
|
Libs: -L${libdir} -lSDL2 -lSDL2 -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 -lm
|
||||||
|
|
Loading…
Reference in a new issue