diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h index 8d38eeaa..4a6b4535 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h index 88d601ba..c56d5df1 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h index 580e0414..6f68ebb2 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -149,6 +149,9 @@ void _ReadWriteBarrier(void); * For more information on these semantics, take a look at the blog post: * http://preshing.com/20120913/acquire-and-release-semantics */ +extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void); +extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); + #if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") @@ -156,11 +159,11 @@ void _ReadWriteBarrier(void); #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") -#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_5TE__) #ifdef __thumb__ /* The mcr instruction isn't available in thumb mode, use real functions */ -extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(void); -extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(void); +#define SDL_MemoryBarrierRelease() SDL_MemoryBarrierReleaseFunction() +#define SDL_MemoryBarrierAcquire() SDL_MemoryBarrierAcquireFunction() #else #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h index b445fe50..920da442 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -185,6 +185,12 @@ typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, /** * A structure to hold a set of audio conversion filters and buffers. + * + * Note that various parts of the conversion pipeline can take advantage + * of SIMD operations (like SSE2, for example). SDL_AudioCVT doesn't require + * you to pass it aligned data, but can possibly run much faster if you + * set both its (buf) field to a pointer that is aligned to 16 bytes, and its + * (len) field to something that's a multiple of 16, if possible. */ #ifdef __GNUC__ /* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h index d2b7282d..f12f2c9a 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h index a54e04cb..5f81a850 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h index dc24e5dd..341f4ba4 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h index 3debadcb..59718cbf 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h @@ -1,7 +1,7 @@ /* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -84,6 +84,7 @@ /* #undef HAVE_DBUS_DBUS_H */ /* #undef HAVE_IBUS_IBUS_H */ /* #undef HAVE_FCITX_FRONTEND_H */ +/* #undef HAVE_LIBSAMPLERATE_H */ /* C library functions */ #define HAVE_MALLOC 1 @@ -364,4 +365,7 @@ /* Enable dynamic udev support */ /* #undef SDL_UDEV_DYNAMIC */ +/* Enable dynamic libsamplerate support */ +/* #undef SDL_LIBSAMPLERATE_DYNAMIC */ + #endif /* SDL_config_h_ */ diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig index ffce187f..41f5baab 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h index b6dc1be7..a7090d1d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h index d912a563..ccc1c364 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h index 07ba0fa9..e439d987 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h index d1c67164..7b3e68bf 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h index 8ee8d5f3..02be3c67 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h index bf3b58eb..d0109c93 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h index 8c0377d7..9cfc9d31 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h index 5a159b6a..a9a83450 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h index 124ca584..9e1de38e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h index 212da0ee..8f60af6b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h index 2d40cb55..25e2ff4f 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,6 +61,9 @@ #ifdef __SSE2__ #include #endif +#ifdef __SSE3__ +#include +#endif #endif #include "begin_code.h" diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h index bea2a6c0..65c110c6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h index c4ce6157..2b06e8c4 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h index c4e37747..49be9827 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h index 83b6c96e..31815388 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h index 42544a21..a1c846ad 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h index 19974716..c9215132 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h index dffb59da..2bba6a72 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h index ff9cc4a9..652e09ac 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h index 849eb6f5..cbea8c5a 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -744,6 +744,63 @@ extern "C" { */ #define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" +/** + * \brief A variable controlling what driver to use for OpenGL ES contexts. + * + * On some platforms, currently Windows and X11, OpenGL drivers may support + * creating contexts with an OpenGL ES profile. By default SDL uses these + * profiles, when available, otherwise it attempts to load an OpenGL ES + * library, e.g. that provided by the ANGLE project. This variable controls + * whether SDL follows this default behaviour or will always load an + * OpenGL ES library. + * + * Circumstances where this is useful include + * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, + * or emulator, e.g. those from ARM, Imagination or Qualcomm. + * - Resolving OpenGL ES function addresses at link time by linking with + * the OpenGL ES library instead of querying them at run time with + * SDL_GL_GetProcAddress(). + * + * Caution: for an application to work with the default behaviour across + * different OpenGL drivers it must query the OpenGL ES function + * addresses at run time using SDL_GL_GetProcAddress(). + * + * This variable is ignored on most platforms because OpenGL ES is native + * or not supported. + * + * This variable can be set to the following values: + * "0" - Use ES profile of OpenGL, if available. (Default when not set.) + * "1" - Load OpenGL ES library using the default library names. + * + */ +#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" + +/** + * \brief A variable controlling speed/quality tradeoff of audio resampling. + * + * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) + * to handle audio resampling. There are different resampling modes available + * that produce different levels of quality, using more CPU. + * + * If this hint isn't specified to a valid setting, or libsamplerate isn't + * available, SDL will use the default, internal resampling algorithm. + * + * Note that this is currently only applicable to resampling audio that is + * being written to a device for playback or audio being read from a device + * for capture. SDL_AudioCVT always uses the default resampler (although this + * might change for SDL 2.1). + * + * This hint is currently only checked at audio subsystem initialization. + * + * This variable can be set to the following values: + * + * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) + * "1" or "fast" - Use fast, slightly higher quality resampling, if available + * "2" or "medium" - Use medium quality resampling, if available + * "3" or "best" - Use high quality resampling, if available + */ +#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" + /** * \brief An enumeration of hint priorities */ diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h index c32badd8..1ee24803 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -73,6 +73,20 @@ typedef struct { typedef Sint32 SDL_JoystickID; +typedef enum +{ + SDL_JOYSTICK_TYPE_UNKNOWN, + SDL_JOYSTICK_TYPE_GAMECONTROLLER, + SDL_JOYSTICK_TYPE_WHEEL, + SDL_JOYSTICK_TYPE_ARCADE_STICK, + SDL_JOYSTICK_TYPE_FLIGHT_STICK, + SDL_JOYSTICK_TYPE_DANCE_PAD, + SDL_JOYSTICK_TYPE_GUITAR, + SDL_JOYSTICK_TYPE_DRUM_KIT, + SDL_JOYSTICK_TYPE_ARCADE_PAD, + SDL_JOYSTICK_TYPE_THROTTLE +} SDL_JoystickType; + typedef enum { SDL_JOYSTICK_POWER_UNKNOWN = -1, @@ -124,6 +138,12 @@ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index); */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index); +/** + * Get the type of a joystick, if available. + * This can be called before any joysticks are opened. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index); + /** * Open a joystick for use. * The index passed as an argument refers to the N'th joystick on the system. @@ -169,6 +189,11 @@ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick); */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick); +/** + * Get the type of an opened joystick. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick); + /** * Return a string representation for this guid. pszGUID must point to at least 33 bytes * (32 for the string plus a NULL terminator). @@ -244,6 +269,18 @@ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis); +/** + * Get the initial state of an axis control on a joystick. + * + * The state is a value ranging from -32768 to 32767. + * + * The axis indices start at index 0. + * + * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, + int axis, Sint16 *state); + /** * \name Hat positions */ diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h index 087bb3af..e78ca469 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h index 8352e623..dcb4a5cc 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h index 47173c6b..6ea256c6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h index 66279e91..13872c11 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h index f1a007a7..24eef5e6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h index 863e6399..c326d8f0 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h index 7aafff32..e8a93471 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h index 661085c3..0272379e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h index 6f553c01..8095ed3f 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h index e0d736b7..f8d80c77 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h index 15abee79..800c5930 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h index c961f0f7..102f2f3f 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h index f2665fa9..04246689 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h index aea66e05..efed8ede 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h index 2506a681..d48e8a37 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h index 8e3b1a03..9283c381 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h index 09fe1a7b..c4f6d74b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h index 011a3f29..3ccb34d3 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h index 798de0f8..e9d7d020 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-10735:754cac536474" -#define SDL_REVISION_NUMBER 10735 +#define SDL_REVISION "hg-10881:2a8921196432" +#define SDL_REVISION_NUMBER 10881 diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h index bd0443c6..54db7c15 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h index b9a57dec..1172add3 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h index df1cf43b..1a65de0d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h index 517a3712..ff42cf75 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h index 14c90834..f685f0f2 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h index b7cbd6d5..eb069b33 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h index f8834d61..7e0e1d40 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h index b2d5cb31..d53352cf 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h index c1e9491a..282625d3 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h index 982dde3a..db9e25eb 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h index 5118af21..06ee80cb 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h index 4872dc22..6e031c41 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h index 402ff1c2..cd20f9b9 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h index 2a97ab70..d2d45f7e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h index d908b00e..12c35ede 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 index 4d5953da..2ee8f88e 100755 Binary files a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 and b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 differ diff --git a/quakespasm/Windows/SDL2/include/SDL.h b/quakespasm/Windows/SDL2/include/SDL.h index 8d38eeaa..4a6b4535 100644 --- a/quakespasm/Windows/SDL2/include/SDL.h +++ b/quakespasm/Windows/SDL2/include/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_assert.h b/quakespasm/Windows/SDL2/include/SDL_assert.h index 88d601ba..c56d5df1 100644 --- a/quakespasm/Windows/SDL2/include/SDL_assert.h +++ b/quakespasm/Windows/SDL2/include/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_atomic.h b/quakespasm/Windows/SDL2/include/SDL_atomic.h index 580e0414..6f68ebb2 100644 --- a/quakespasm/Windows/SDL2/include/SDL_atomic.h +++ b/quakespasm/Windows/SDL2/include/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -149,6 +149,9 @@ void _ReadWriteBarrier(void); * For more information on these semantics, take a look at the blog post: * http://preshing.com/20120913/acquire-and-release-semantics */ +extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void); +extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); + #if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") @@ -156,11 +159,11 @@ void _ReadWriteBarrier(void); #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") -#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_5TE__) #ifdef __thumb__ /* The mcr instruction isn't available in thumb mode, use real functions */ -extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(void); -extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(void); +#define SDL_MemoryBarrierRelease() SDL_MemoryBarrierReleaseFunction() +#define SDL_MemoryBarrierAcquire() SDL_MemoryBarrierAcquireFunction() #else #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") diff --git a/quakespasm/Windows/SDL2/include/SDL_audio.h b/quakespasm/Windows/SDL2/include/SDL_audio.h index b445fe50..920da442 100644 --- a/quakespasm/Windows/SDL2/include/SDL_audio.h +++ b/quakespasm/Windows/SDL2/include/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -185,6 +185,12 @@ typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, /** * A structure to hold a set of audio conversion filters and buffers. + * + * Note that various parts of the conversion pipeline can take advantage + * of SIMD operations (like SSE2, for example). SDL_AudioCVT doesn't require + * you to pass it aligned data, but can possibly run much faster if you + * set both its (buf) field to a pointer that is aligned to 16 bytes, and its + * (len) field to something that's a multiple of 16, if possible. */ #ifdef __GNUC__ /* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't diff --git a/quakespasm/Windows/SDL2/include/SDL_bits.h b/quakespasm/Windows/SDL2/include/SDL_bits.h index d2b7282d..f12f2c9a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_bits.h +++ b/quakespasm/Windows/SDL2/include/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_blendmode.h b/quakespasm/Windows/SDL2/include/SDL_blendmode.h index a54e04cb..5f81a850 100644 --- a/quakespasm/Windows/SDL2/include/SDL_blendmode.h +++ b/quakespasm/Windows/SDL2/include/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_clipboard.h b/quakespasm/Windows/SDL2/include/SDL_clipboard.h index dc24e5dd..341f4ba4 100644 --- a/quakespasm/Windows/SDL2/include/SDL_clipboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config.h b/quakespasm/Windows/SDL2/include/SDL_config.h index ffce187f..41f5baab 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config.h +++ b/quakespasm/Windows/SDL2/include/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_android.h b/quakespasm/Windows/SDL2/include/SDL_config_android.h index b6dc1be7..a7090d1d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_android.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h index d912a563..ccc1c364 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h index 07ba0fa9..e439d987 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h index d1c67164..7b3e68bf 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h index 8ee8d5f3..02be3c67 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_psp.h b/quakespasm/Windows/SDL2/include/SDL_config_psp.h index bf3b58eb..d0109c93 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_psp.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_psp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_windows.h b/quakespasm/Windows/SDL2/include/SDL_config_windows.h index 8c0377d7..9cfc9d31 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_windows.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h index 5a159b6a..a9a83450 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h index 124ca584..9e1de38e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_copying.h b/quakespasm/Windows/SDL2/include/SDL_copying.h index 212da0ee..8f60af6b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_copying.h +++ b/quakespasm/Windows/SDL2/include/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h index 2d40cb55..25e2ff4f 100644 --- a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h +++ b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,6 +61,9 @@ #ifdef __SSE2__ #include #endif +#ifdef __SSE3__ +#include +#endif #endif #include "begin_code.h" diff --git a/quakespasm/Windows/SDL2/include/SDL_egl.h b/quakespasm/Windows/SDL2/include/SDL_egl.h index bea2a6c0..65c110c6 100644 --- a/quakespasm/Windows/SDL2/include/SDL_egl.h +++ b/quakespasm/Windows/SDL2/include/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_endian.h b/quakespasm/Windows/SDL2/include/SDL_endian.h index c4ce6157..2b06e8c4 100644 --- a/quakespasm/Windows/SDL2/include/SDL_endian.h +++ b/quakespasm/Windows/SDL2/include/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_error.h b/quakespasm/Windows/SDL2/include/SDL_error.h index c4e37747..49be9827 100644 --- a/quakespasm/Windows/SDL2/include/SDL_error.h +++ b/quakespasm/Windows/SDL2/include/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_events.h b/quakespasm/Windows/SDL2/include/SDL_events.h index 83b6c96e..31815388 100644 --- a/quakespasm/Windows/SDL2/include/SDL_events.h +++ b/quakespasm/Windows/SDL2/include/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_filesystem.h b/quakespasm/Windows/SDL2/include/SDL_filesystem.h index 42544a21..a1c846ad 100644 --- a/quakespasm/Windows/SDL2/include/SDL_filesystem.h +++ b/quakespasm/Windows/SDL2/include/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h index 19974716..c9215132 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h +++ b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_gesture.h b/quakespasm/Windows/SDL2/include/SDL_gesture.h index dffb59da..2bba6a72 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gesture.h +++ b/quakespasm/Windows/SDL2/include/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_haptic.h b/quakespasm/Windows/SDL2/include/SDL_haptic.h index ff9cc4a9..652e09ac 100644 --- a/quakespasm/Windows/SDL2/include/SDL_haptic.h +++ b/quakespasm/Windows/SDL2/include/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_hints.h b/quakespasm/Windows/SDL2/include/SDL_hints.h index 849eb6f5..cbea8c5a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_hints.h +++ b/quakespasm/Windows/SDL2/include/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -744,6 +744,63 @@ extern "C" { */ #define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" +/** + * \brief A variable controlling what driver to use for OpenGL ES contexts. + * + * On some platforms, currently Windows and X11, OpenGL drivers may support + * creating contexts with an OpenGL ES profile. By default SDL uses these + * profiles, when available, otherwise it attempts to load an OpenGL ES + * library, e.g. that provided by the ANGLE project. This variable controls + * whether SDL follows this default behaviour or will always load an + * OpenGL ES library. + * + * Circumstances where this is useful include + * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, + * or emulator, e.g. those from ARM, Imagination or Qualcomm. + * - Resolving OpenGL ES function addresses at link time by linking with + * the OpenGL ES library instead of querying them at run time with + * SDL_GL_GetProcAddress(). + * + * Caution: for an application to work with the default behaviour across + * different OpenGL drivers it must query the OpenGL ES function + * addresses at run time using SDL_GL_GetProcAddress(). + * + * This variable is ignored on most platforms because OpenGL ES is native + * or not supported. + * + * This variable can be set to the following values: + * "0" - Use ES profile of OpenGL, if available. (Default when not set.) + * "1" - Load OpenGL ES library using the default library names. + * + */ +#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" + +/** + * \brief A variable controlling speed/quality tradeoff of audio resampling. + * + * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) + * to handle audio resampling. There are different resampling modes available + * that produce different levels of quality, using more CPU. + * + * If this hint isn't specified to a valid setting, or libsamplerate isn't + * available, SDL will use the default, internal resampling algorithm. + * + * Note that this is currently only applicable to resampling audio that is + * being written to a device for playback or audio being read from a device + * for capture. SDL_AudioCVT always uses the default resampler (although this + * might change for SDL 2.1). + * + * This hint is currently only checked at audio subsystem initialization. + * + * This variable can be set to the following values: + * + * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) + * "1" or "fast" - Use fast, slightly higher quality resampling, if available + * "2" or "medium" - Use medium quality resampling, if available + * "3" or "best" - Use high quality resampling, if available + */ +#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" + /** * \brief An enumeration of hint priorities */ diff --git a/quakespasm/Windows/SDL2/include/SDL_joystick.h b/quakespasm/Windows/SDL2/include/SDL_joystick.h index c32badd8..1ee24803 100644 --- a/quakespasm/Windows/SDL2/include/SDL_joystick.h +++ b/quakespasm/Windows/SDL2/include/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -73,6 +73,20 @@ typedef struct { typedef Sint32 SDL_JoystickID; +typedef enum +{ + SDL_JOYSTICK_TYPE_UNKNOWN, + SDL_JOYSTICK_TYPE_GAMECONTROLLER, + SDL_JOYSTICK_TYPE_WHEEL, + SDL_JOYSTICK_TYPE_ARCADE_STICK, + SDL_JOYSTICK_TYPE_FLIGHT_STICK, + SDL_JOYSTICK_TYPE_DANCE_PAD, + SDL_JOYSTICK_TYPE_GUITAR, + SDL_JOYSTICK_TYPE_DRUM_KIT, + SDL_JOYSTICK_TYPE_ARCADE_PAD, + SDL_JOYSTICK_TYPE_THROTTLE +} SDL_JoystickType; + typedef enum { SDL_JOYSTICK_POWER_UNKNOWN = -1, @@ -124,6 +138,12 @@ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index); */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index); +/** + * Get the type of a joystick, if available. + * This can be called before any joysticks are opened. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index); + /** * Open a joystick for use. * The index passed as an argument refers to the N'th joystick on the system. @@ -169,6 +189,11 @@ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick); */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick); +/** + * Get the type of an opened joystick. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick); + /** * Return a string representation for this guid. pszGUID must point to at least 33 bytes * (32 for the string plus a NULL terminator). @@ -244,6 +269,18 @@ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis); +/** + * Get the initial state of an axis control on a joystick. + * + * The state is a value ranging from -32768 to 32767. + * + * The axis indices start at index 0. + * + * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, + int axis, Sint16 *state); + /** * \name Hat positions */ diff --git a/quakespasm/Windows/SDL2/include/SDL_keyboard.h b/quakespasm/Windows/SDL2/include/SDL_keyboard.h index 087bb3af..e78ca469 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keyboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_keycode.h b/quakespasm/Windows/SDL2/include/SDL_keycode.h index 8352e623..dcb4a5cc 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keycode.h +++ b/quakespasm/Windows/SDL2/include/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_loadso.h b/quakespasm/Windows/SDL2/include/SDL_loadso.h index 47173c6b..6ea256c6 100644 --- a/quakespasm/Windows/SDL2/include/SDL_loadso.h +++ b/quakespasm/Windows/SDL2/include/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_log.h b/quakespasm/Windows/SDL2/include/SDL_log.h index 66279e91..13872c11 100644 --- a/quakespasm/Windows/SDL2/include/SDL_log.h +++ b/quakespasm/Windows/SDL2/include/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_main.h b/quakespasm/Windows/SDL2/include/SDL_main.h index f1a007a7..24eef5e6 100644 --- a/quakespasm/Windows/SDL2/include/SDL_main.h +++ b/quakespasm/Windows/SDL2/include/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_messagebox.h b/quakespasm/Windows/SDL2/include/SDL_messagebox.h index 863e6399..c326d8f0 100644 --- a/quakespasm/Windows/SDL2/include/SDL_messagebox.h +++ b/quakespasm/Windows/SDL2/include/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_mouse.h b/quakespasm/Windows/SDL2/include/SDL_mouse.h index 7aafff32..e8a93471 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mouse.h +++ b/quakespasm/Windows/SDL2/include/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_mutex.h b/quakespasm/Windows/SDL2/include/SDL_mutex.h index 661085c3..0272379e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mutex.h +++ b/quakespasm/Windows/SDL2/include/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_name.h b/quakespasm/Windows/SDL2/include/SDL_name.h index 6f553c01..8095ed3f 100644 --- a/quakespasm/Windows/SDL2/include/SDL_name.h +++ b/quakespasm/Windows/SDL2/include/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengl.h b/quakespasm/Windows/SDL2/include/SDL_opengl.h index e0d736b7..f8d80c77 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengl.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengles.h b/quakespasm/Windows/SDL2/include/SDL_opengles.h index 15abee79..800c5930 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengles.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengles2.h b/quakespasm/Windows/SDL2/include/SDL_opengles2.h index c961f0f7..102f2f3f 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengles2.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_pixels.h b/quakespasm/Windows/SDL2/include/SDL_pixels.h index f2665fa9..04246689 100644 --- a/quakespasm/Windows/SDL2/include/SDL_pixels.h +++ b/quakespasm/Windows/SDL2/include/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_platform.h b/quakespasm/Windows/SDL2/include/SDL_platform.h index aea66e05..efed8ede 100644 --- a/quakespasm/Windows/SDL2/include/SDL_platform.h +++ b/quakespasm/Windows/SDL2/include/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_power.h b/quakespasm/Windows/SDL2/include/SDL_power.h index 2506a681..d48e8a37 100644 --- a/quakespasm/Windows/SDL2/include/SDL_power.h +++ b/quakespasm/Windows/SDL2/include/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_quit.h b/quakespasm/Windows/SDL2/include/SDL_quit.h index 8e3b1a03..9283c381 100644 --- a/quakespasm/Windows/SDL2/include/SDL_quit.h +++ b/quakespasm/Windows/SDL2/include/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_rect.h b/quakespasm/Windows/SDL2/include/SDL_rect.h index 09fe1a7b..c4f6d74b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rect.h +++ b/quakespasm/Windows/SDL2/include/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_render.h b/quakespasm/Windows/SDL2/include/SDL_render.h index 011a3f29..3ccb34d3 100644 --- a/quakespasm/Windows/SDL2/include/SDL_render.h +++ b/quakespasm/Windows/SDL2/include/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_revision.h b/quakespasm/Windows/SDL2/include/SDL_revision.h index 798de0f8..e9d7d020 100644 --- a/quakespasm/Windows/SDL2/include/SDL_revision.h +++ b/quakespasm/Windows/SDL2/include/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-10735:754cac536474" -#define SDL_REVISION_NUMBER 10735 +#define SDL_REVISION "hg-10881:2a8921196432" +#define SDL_REVISION_NUMBER 10881 diff --git a/quakespasm/Windows/SDL2/include/SDL_rwops.h b/quakespasm/Windows/SDL2/include/SDL_rwops.h index bd0443c6..54db7c15 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rwops.h +++ b/quakespasm/Windows/SDL2/include/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_scancode.h b/quakespasm/Windows/SDL2/include/SDL_scancode.h index b9a57dec..1172add3 100644 --- a/quakespasm/Windows/SDL2/include/SDL_scancode.h +++ b/quakespasm/Windows/SDL2/include/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_shape.h b/quakespasm/Windows/SDL2/include/SDL_shape.h index df1cf43b..1a65de0d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_shape.h +++ b/quakespasm/Windows/SDL2/include/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_stdinc.h b/quakespasm/Windows/SDL2/include/SDL_stdinc.h index 517a3712..ff42cf75 100644 --- a/quakespasm/Windows/SDL2/include/SDL_stdinc.h +++ b/quakespasm/Windows/SDL2/include/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_surface.h b/quakespasm/Windows/SDL2/include/SDL_surface.h index 14c90834..f685f0f2 100644 --- a/quakespasm/Windows/SDL2/include/SDL_surface.h +++ b/quakespasm/Windows/SDL2/include/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_system.h b/quakespasm/Windows/SDL2/include/SDL_system.h index b7cbd6d5..eb069b33 100644 --- a/quakespasm/Windows/SDL2/include/SDL_system.h +++ b/quakespasm/Windows/SDL2/include/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_syswm.h b/quakespasm/Windows/SDL2/include/SDL_syswm.h index f8834d61..7e0e1d40 100644 --- a/quakespasm/Windows/SDL2/include/SDL_syswm.h +++ b/quakespasm/Windows/SDL2/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_thread.h b/quakespasm/Windows/SDL2/include/SDL_thread.h index b2d5cb31..d53352cf 100644 --- a/quakespasm/Windows/SDL2/include/SDL_thread.h +++ b/quakespasm/Windows/SDL2/include/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_timer.h b/quakespasm/Windows/SDL2/include/SDL_timer.h index c1e9491a..282625d3 100644 --- a/quakespasm/Windows/SDL2/include/SDL_timer.h +++ b/quakespasm/Windows/SDL2/include/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_touch.h b/quakespasm/Windows/SDL2/include/SDL_touch.h index 982dde3a..db9e25eb 100644 --- a/quakespasm/Windows/SDL2/include/SDL_touch.h +++ b/quakespasm/Windows/SDL2/include/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_types.h b/quakespasm/Windows/SDL2/include/SDL_types.h index 5118af21..06ee80cb 100644 --- a/quakespasm/Windows/SDL2/include/SDL_types.h +++ b/quakespasm/Windows/SDL2/include/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_version.h b/quakespasm/Windows/SDL2/include/SDL_version.h index 4872dc22..6e031c41 100644 --- a/quakespasm/Windows/SDL2/include/SDL_version.h +++ b/quakespasm/Windows/SDL2/include/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_video.h b/quakespasm/Windows/SDL2/include/SDL_video.h index 402ff1c2..cd20f9b9 100644 --- a/quakespasm/Windows/SDL2/include/SDL_video.h +++ b/quakespasm/Windows/SDL2/include/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/begin_code.h b/quakespasm/Windows/SDL2/include/begin_code.h index 2a97ab70..d2d45f7e 100644 --- a/quakespasm/Windows/SDL2/include/begin_code.h +++ b/quakespasm/Windows/SDL2/include/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/close_code.h b/quakespasm/Windows/SDL2/include/close_code.h index d908b00e..12c35ede 100644 --- a/quakespasm/Windows/SDL2/include/close_code.h +++ b/quakespasm/Windows/SDL2/include/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Copyright (C) 1997-2017 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/lib/SDL2.dll b/quakespasm/Windows/SDL2/lib/SDL2.dll index 8d52f4fd..00c1ad17 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2.dll and b/quakespasm/Windows/SDL2/lib/SDL2.dll differ diff --git a/quakespasm/Windows/SDL2/lib/SDL2.lib b/quakespasm/Windows/SDL2/lib/SDL2.lib index d8b545c8..667f495b 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2.lib and b/quakespasm/Windows/SDL2/lib/SDL2.lib differ diff --git a/quakespasm/Windows/SDL2/lib/SDL2main.lib b/quakespasm/Windows/SDL2/lib/SDL2main.lib index 9f864b65..617068f7 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2main.lib and b/quakespasm/Windows/SDL2/lib/SDL2main.lib differ diff --git a/quakespasm/Windows/SDL2/lib/libSDL2.dll.a b/quakespasm/Windows/SDL2/lib/libSDL2.dll.a index 484f0366..ce37d731 100644 Binary files a/quakespasm/Windows/SDL2/lib/libSDL2.dll.a and b/quakespasm/Windows/SDL2/lib/libSDL2.dll.a differ diff --git a/quakespasm/Windows/SDL2/lib/libSDL2main.a b/quakespasm/Windows/SDL2/lib/libSDL2main.a index 1be32594..8940120e 100644 Binary files a/quakespasm/Windows/SDL2/lib/libSDL2main.a and b/quakespasm/Windows/SDL2/lib/libSDL2main.a differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.dll b/quakespasm/Windows/SDL2/lib64/SDL2.dll index 03105e93..9d3fde8e 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.dll and b/quakespasm/Windows/SDL2/lib64/SDL2.dll differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.lib b/quakespasm/Windows/SDL2/lib64/SDL2.lib index d8a54005..12c21717 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.lib and b/quakespasm/Windows/SDL2/lib64/SDL2.lib differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2main.lib b/quakespasm/Windows/SDL2/lib64/SDL2main.lib index 5cbe8eb6..2b0e2326 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2main.lib and b/quakespasm/Windows/SDL2/lib64/SDL2main.lib differ diff --git a/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a b/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a index eab45e2f..c3d7aa57 100644 Binary files a/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a and b/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a differ diff --git a/quakespasm/Windows/SDL2/lib64/libSDL2main.a b/quakespasm/Windows/SDL2/lib64/libSDL2main.a index 61beb642..b3a2d10a 100644 Binary files a/quakespasm/Windows/SDL2/lib64/libSDL2main.a and b/quakespasm/Windows/SDL2/lib64/libSDL2main.a differ