zdoom
/
zdoom-macos-deps
mirror of https://github.com/ZDoom/zdoom-macos-deps.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: update sdl2 to 2.28.5

This commit is contained in:
alexey.lysiuk 2023-11-03 13:23:42 +02:00
parent e3da13a96e
commit 1f0261a993
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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.28.4 echo 2.28.5
;; ;;
--cflags) --cflags)
echo -I${prefix}/include/SDL2 -D_THREAD_SAFE echo -I${prefix}/include/SDL2 -D_THREAD_SAFE
@ -53,7 +53,7 @@ while test $# -gt 0; do
# ;; # ;;
# --static-libs) # --static-libs)
--libs|--static-libs) --libs|--static-libs)
sdl_static_libs=$(echo " -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" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") sdl_static_libs=$(echo " -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" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g")
echo -L${exec_prefix}/lib $sdl_static_libs echo -L${exec_prefix}/lib $sdl_static_libs
;; ;;
*) *)

2
deps/sdl2/include/SDL2/SDL_config.h vendored
View File

@ -342,7 +342,7 @@
/* #undef SDL_JOYSTICK_XINPUT */ /* #undef SDL_JOYSTICK_XINPUT */
/* #undef SDL_JOYSTICK_DUMMY */ /* #undef SDL_JOYSTICK_DUMMY */
#define SDL_JOYSTICK_IOKIT 1 #define SDL_JOYSTICK_IOKIT 1
/* #undef SDL_JOYSTICK_MFI */ #define SDL_JOYSTICK_MFI 1
/* #undef SDL_JOYSTICK_LINUX */ /* #undef SDL_JOYSTICK_LINUX */
/* #undef SDL_JOYSTICK_OS2 */ /* #undef SDL_JOYSTICK_OS2 */
/* #undef SDL_JOYSTICK_USBHID */ /* #undef SDL_JOYSTICK_USBHID */

4
deps/sdl2/include/SDL2/SDL_revision.h vendored
View File

@ -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.28.4-0-gcc016b004 (" SDL_VENDOR_INFO ")" #define SDL_REVISION "SDL-release-2.28.5-0-g15ead9a40 (" SDL_VENDOR_INFO ")"
#else #else
#define SDL_REVISION "SDL-release-2.28.4-0-gcc016b004" #define SDL_REVISION "SDL-release-2.28.5-0-g15ead9a40"
#endif #endif

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 28 #define SDL_MINOR_VERSION 28
#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.

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.28.4") set(PACKAGE_VERSION "2.28.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

2
deps/sdl2/lib/cmake/SDL2/SDL2staticTargets.cmake vendored
View File

@ -62,7 +62,7 @@ set_target_properties(SDL2::SDL2-static PROPERTIES
COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED" COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
COMPATIBLE_INTERFACE_STRING "SDL_VERSION" COMPATIBLE_INTERFACE_STRING "SDL_VERSION"
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/SDL2" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/SDL2"
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>;-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;\$<LINK_ONLY:>" INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>;-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;\$<LINK_ONLY:>"
INTERFACE_SDL2_SHARED "FALSE" INTERFACE_SDL2_SHARED "FALSE"
INTERFACE_SDL_VERSION "SDL2" INTERFACE_SDL_VERSION "SDL2"
) )

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.

4
deps/sdl2/lib/pkgconfig/sdl2.pc vendored
View File

@ -7,8 +7,8 @@ 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.28.4 Version: 2.28.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,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,GameController -Wl,-weak_framework,Metal -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,CoreHaptics -lm
Cflags: -I${includedir} -I${includedir}/SDL2 -D_THREAD_SAFE Cflags: -I${includedir} -I${includedir}/SDL2 -D_THREAD_SAFE