zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-10 14:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

update sdl2 to 2.24.1

Browse source
This commit is contained in:
alexey.lysiuk 2022-10-05 10:26:16 +03:00
parent 6ac376d517
commit ed125b5675
8 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/sdl2/bin/sdl2-config vendored
View file

@ -43,7 +43,7 @@ while test $# -gt 0; do
echo $exec_prefix echo $exec_prefix
;; ;;
--version) --version)
echo 2.24.0 echo 2.24.1
;; ;;
--cflags) --cflags)
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE echo -I${prefix}/include/SDL2 -D_THREAD_SAFE

2
deps/sdl2/include/SDL2/SDL_atomic.h vendored
View file

@ -240,7 +240,7 @@ typedef void (*SDL_KernelMemoryBarrierFunc)();
/* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */ /* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */
#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */ #define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */
#elif (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__) #elif (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__)
#define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory") #define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory")
#elif (defined(__powerpc__) || defined(__powerpc64__)) #elif (defined(__powerpc__) || defined(__powerpc64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27"); #define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27");

1
deps/sdl2/include/SDL2/SDL_config.h vendored
View file

@ -224,6 +224,7 @@
/* #undef HAVE_INOTIFY_INIT */ /* #undef HAVE_INOTIFY_INIT */
/* #undef HAVE_INOTIFY_INIT1 */ /* #undef HAVE_INOTIFY_INIT1 */
/* #undef HAVE_INOTIFY */ /* #undef HAVE_INOTIFY */
/* #undef HAVE_LIBUSB */
#define HAVE_O_CLOEXEC 1 #define HAVE_O_CLOEXEC 1
/* Apple platforms might be building universal binaries, where Intel builds /* Apple platforms might be building universal binaries, where Intel builds

2
deps/sdl2/include/SDL2/SDL_version.h vendored
View file

@ -59,7 +59,7 @@ typedef struct SDL_version
*/ */
#define SDL_MAJOR_VERSION 2 #define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 24 #define SDL_MINOR_VERSION 24
#define SDL_PATCHLEVEL 0 #define SDL_PATCHLEVEL 1
/** /**
* Macro to determine SDL version program was compiled against. * Macro to determine SDL version program was compiled against.

2
deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake vendored
View file

@ -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.24.0") set(PACKAGE_VERSION "2.24.1")
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
View file

Binary file not shown.

BIN
deps/sdl2/lib/libSDL2main.a vendored
View file

Binary file not shown.

2
deps/sdl2/lib/pkgconfig/sdl2.pc vendored
View file

@ -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.24.0 Version: 2.24.1
Requires: Requires:
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,Metal -Wl,-weak_framework,QuartzCore -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,Metal -Wl,-weak_framework,QuartzCore -lm