diff --git a/deps/sdl2/bin/sdl2-config b/deps/sdl2/bin/sdl2-config index e1a9a3c9..e093e838 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.28.4 + echo 2.28.5 ;; --cflags) echo -I${prefix}/include/SDL2 -D_THREAD_SAFE @@ -53,7 +53,7 @@ while test $# -gt 0; do # ;; # --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 ;; *) diff --git a/deps/sdl2/include/SDL2/SDL_config.h b/deps/sdl2/include/SDL2/SDL_config.h index 2df4c551..8b9355e0 100644 --- a/deps/sdl2/include/SDL2/SDL_config.h +++ b/deps/sdl2/include/SDL2/SDL_config.h @@ -342,7 +342,7 @@ /* #undef SDL_JOYSTICK_XINPUT */ /* #undef SDL_JOYSTICK_DUMMY */ #define SDL_JOYSTICK_IOKIT 1 -/* #undef SDL_JOYSTICK_MFI */ +#define SDL_JOYSTICK_MFI 1 /* #undef SDL_JOYSTICK_LINUX */ /* #undef SDL_JOYSTICK_OS2 */ /* #undef SDL_JOYSTICK_USBHID */ diff --git a/deps/sdl2/include/SDL2/SDL_revision.h b/deps/sdl2/include/SDL2/SDL_revision.h index 33dce508..d97345fb 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.28.4-0-gcc016b004 (" SDL_VENDOR_INFO ")" +#define SDL_REVISION "SDL-release-2.28.5-0-g15ead9a40 (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "SDL-release-2.28.4-0-gcc016b004" +#define SDL_REVISION "SDL-release-2.28.5-0-g15ead9a40" #endif diff --git a/deps/sdl2/include/SDL2/SDL_version.h b/deps/sdl2/include/SDL2/SDL_version.h index 57c171cc..7585eece 100644 --- a/deps/sdl2/include/SDL2/SDL_version.h +++ b/deps/sdl2/include/SDL2/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 28 -#define SDL_PATCHLEVEL 4 +#define SDL_PATCHLEVEL 5 /** * 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 3ca88b5b..0f4422a6 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.28.4") +set(PACKAGE_VERSION "2.28.5") if (PACKAGE_FIND_VERSION_RANGE) # Package version must be in the requested version range diff --git a/deps/sdl2/lib/cmake/SDL2/SDL2staticTargets.cmake b/deps/sdl2/lib/cmake/SDL2/SDL2staticTargets.cmake index 5fa159ac..0ed0b8c3 100644 --- a/deps/sdl2/lib/cmake/SDL2/SDL2staticTargets.cmake +++ b/deps/sdl2/lib/cmake/SDL2/SDL2staticTargets.cmake @@ -62,7 +62,7 @@ set_target_properties(SDL2::SDL2-static PROPERTIES COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED" COMPATIBLE_INTERFACE_STRING "SDL_VERSION" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/SDL2" - INTERFACE_LINK_LIBRARIES "\$;-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;\$" + INTERFACE_LINK_LIBRARIES "\$;-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;\$" INTERFACE_SDL2_SHARED "FALSE" INTERFACE_SDL_VERSION "SDL2" ) diff --git a/deps/sdl2/lib/libSDL2.a b/deps/sdl2/lib/libSDL2.a index 4a09e4b0..a9d50809 100644 Binary files a/deps/sdl2/lib/libSDL2.a and b/deps/sdl2/lib/libSDL2.a differ diff --git a/deps/sdl2/lib/libSDL2main.a b/deps/sdl2/lib/libSDL2main.a index d2ac00bf..ecc974c2 100644 Binary files a/deps/sdl2/lib/libSDL2main.a and b/deps/sdl2/lib/libSDL2main.a differ diff --git a/deps/sdl2/lib/pkgconfig/sdl2.pc b/deps/sdl2/lib/pkgconfig/sdl2.pc index 3af90440..e71fb307 100644 --- a/deps/sdl2/lib/pkgconfig/sdl2.pc +++ b/deps/sdl2/lib/pkgconfig/sdl2.pc @@ -7,8 +7,8 @@ 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.28.4 +Version: 2.28.5 Requires.private: 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