SDL2 for Windows and OSX: rebuilt from SDL hg-11442:11413fa29401 :

- Mainly includes a few Mac OS X fixes since rev. 11427, and some game controller updates (SDL bugs 3483, 3691, 3789, 3791, 3792.) git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1493 af15c1b1-3010-417e-b628-4374ebc0bcbd
2024-11-10 07:21:58 +00:00 · 2017-09-02 12:10:42 +00:00 · 2017-09-02 12:10:42 +00:00 · 050283be01
commit 050283be01
parent 5a999570e2
7 changed files with 6 additions and 6 deletions
--- a/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h
+++ b/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h
@ -60,7 +60,7 @@ extern _inline int _SDL_clz_watcom (Uint32);
 SDL_FORCE_INLINE int
 SDL_MostSignificantBitIndex32(Uint32 x)
 {
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
    /* Count Leading Zeroes builtin in GCC.
     * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html
     */
--- a/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
+++ b/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-11427:381449ca1cd2"
-#define SDL_REVISION_NUMBER 11427
+#define SDL_REVISION "hg-11442:11413fa29401"
+#define SDL_REVISION_NUMBER 11442
--- a/MacOSX/SDL2.framework/Versions/A/SDL2
+++ b/MacOSX/SDL2.framework/Versions/A/SDL2
--- a/Windows/SDL2/include/SDL_bits.h
+++ b/Windows/SDL2/include/SDL_bits.h
@ -60,7 +60,7 @@ extern _inline int _SDL_clz_watcom (Uint32);
 SDL_FORCE_INLINE int
 SDL_MostSignificantBitIndex32(Uint32 x)
 {
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
    /* Count Leading Zeroes builtin in GCC.
     * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html
     */
--- a/Windows/SDL2/include/SDL_revision.h
+++ b/Windows/SDL2/include/SDL_revision.h
@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-11427:381449ca1cd2"
-#define SDL_REVISION_NUMBER 11427
+#define SDL_REVISION "hg-11442:11413fa29401"
+#define SDL_REVISION_NUMBER 11442
--- a/Windows/SDL2/lib/SDL2.dll
+++ b/Windows/SDL2/lib/SDL2.dll
--- a/Windows/SDL2/lib64/SDL2.dll
+++ b/Windows/SDL2/lib64/SDL2.dll