diff --git a/deps/sdl2/bin/sdl2-config b/deps/sdl2/bin/sdl2-config index 8400c453..90c1b4b2 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.24.1 + echo 2.24.2 ;; --cflags) echo -I${prefix}/include/SDL2 -D_THREAD_SAFE diff --git a/deps/sdl2/include/SDL2/SDL_stdinc.h b/deps/sdl2/include/SDL2/SDL_stdinc.h index 5f79c95b..3514ba92 100644 --- a/deps/sdl2/include/SDL2/SDL_stdinc.h +++ b/deps/sdl2/include/SDL2/SDL_stdinc.h @@ -80,9 +80,9 @@ # include #endif #ifdef HAVE_MATH_H -# if defined(__WINRT__) +# if defined(_MSC_VER) /* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on - WinRT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx + Visual Studio. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx for more information. */ # define _USE_MATH_DEFINES diff --git a/deps/sdl2/include/SDL2/SDL_version.h b/deps/sdl2/include/SDL2/SDL_version.h index 9dfaf79c..95d47bb2 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 24 -#define SDL_PATCHLEVEL 1 +#define SDL_PATCHLEVEL 2 /** * 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 fddaed4d..c539b369 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.24.1") +set(PACKAGE_VERSION "2.24.2") 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 03e8fd16..5ad3149a 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 b18fee9d..ec7b7e67 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 1206a224..5c909c74 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.24.1 +Version: 2.24.2 Requires: 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