diff --git a/deps/sdl2/bin/sdl2-config b/deps/sdl2/bin/sdl2-config index 86bc70e9..f1e7f21c 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.30.8 + echo 2.30.9 ;; --cflags) echo -I${prefix}/include/SDL2 -D_THREAD_SAFE diff --git a/deps/sdl2/include/SDL2/SDL_audio.h b/deps/sdl2/include/SDL2/SDL_audio.h index bd8e7ab6..9bb03327 100644 --- a/deps/sdl2/include/SDL2/SDL_audio.h +++ b/deps/sdl2/include/SDL2/SDL_audio.h @@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name, * frames_ (with stereo output, two samples--left and right--would make a * single sample frame). This number should be a power of two, and may be * adjusted by the audio driver to a value more suitable for the hardware. - * Good values seem to range between 512 and 8096 inclusive, depending on + * Good values seem to range between 512 and 4096 inclusive, depending on * the application and CPU speed. Smaller values reduce latency, but can * lead to underflow if the application is doing heavy processing and cannot * fill the audio buffer in time. Note that the number of sample frames is diff --git a/deps/sdl2/include/SDL2/SDL_revision.h b/deps/sdl2/include/SDL2/SDL_revision.h index 6bde51fa..f8d4495f 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-2.30.8 (" SDL_VENDOR_INFO ")" +#define SDL_REVISION "SDL-2.30.9 (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "SDL-2.30.8" +#define SDL_REVISION "SDL-2.30.9" #endif diff --git a/deps/sdl2/include/SDL2/SDL_stdinc.h b/deps/sdl2/include/SDL2/SDL_stdinc.h index 8113f453..8eb75795 100644 --- a/deps/sdl2/include/SDL2/SDL_stdinc.h +++ b/deps/sdl2/include/SDL2/SDL_stdinc.h @@ -257,7 +257,7 @@ typedef uint64_t Uint64; #define SDL_PRIs64 "I64d" #elif defined(PRIs64) #define SDL_PRIs64 PRIs64 -#elif defined(__LP64__) && !defined(__APPLE__) +#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__) #define SDL_PRIs64 "ld" #else #define SDL_PRIs64 "lld" diff --git a/deps/sdl2/include/SDL2/SDL_version.h b/deps/sdl2/include/SDL2/SDL_version.h index dc8a254f..fb79785f 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 30 -#define SDL_PATCHLEVEL 8 +#define SDL_PATCHLEVEL 9 /** * Macro to determine SDL version program was compiled against. diff --git a/deps/sdl2/include/SDL2/SDL_vulkan.h b/deps/sdl2/include/SDL2/SDL_vulkan.h index ab86a0b8..a506ef45 100644 --- a/deps/sdl2/include/SDL2/SDL_vulkan.h +++ b/deps/sdl2/include/SDL2/SDL_vulkan.h @@ -52,6 +52,10 @@ extern "C" { VK_DEFINE_HANDLE(VkInstance) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) +/* Make sure to undef to avoid issues in case of later vulkan include */ +#undef VK_DEFINE_HANDLE +#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE + #endif /* !NO_SDL_VULKAN_TYPEDEFS */ typedef VkInstance SDL_vulkanInstance; diff --git a/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake b/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake index 8409ed0b..3859234b 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.30.8") +set(PACKAGE_VERSION "2.30.9") if (PACKAGE_FIND_VERSION_RANGE) # Package version must be in the requested version range diff --git a/deps/sdl2/lib/libSDL2.a b/deps/sdl2/lib/libSDL2.a index a53ce08d..13f64b80 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 f42cc699..ac9ba988 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 e02f124f..34badf28 100644 --- a/deps/sdl2/lib/pkgconfig/sdl2.pc +++ b/deps/sdl2/lib/pkgconfig/sdl2.pc @@ -7,7 +7,7 @@ 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.30.8 +Version: 2.30.9 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,GameController -Wl,-weak_framework,Metal -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,CoreHaptics -lm