diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h index 1a3fa285..8d38eeaa 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h @@ -26,8 +26,8 @@ */ -#ifndef _SDL_H -#define _SDL_H +#ifndef SDL_h_ +#define SDL_h_ #include "SDL_main.h" #include "SDL_stdinc.h" @@ -127,6 +127,6 @@ extern DECLSPEC void SDLCALL SDL_Quit(void); #endif #include "close_code.h" -#endif /* _SDL_H */ +#endif /* SDL_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 402981f9..88d601ba 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_assert_h -#define _SDL_assert_h +#ifndef SDL_assert_h_ +#define SDL_assert_h_ #include "SDL_config.h" @@ -201,7 +201,7 @@ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)( * * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * - * \return SDL_AssertState value of how to handle the assertion failure. + * Return SDL_AssertState value of how to handle the assertion failure. * * \param handler Callback function, called when an assertion fails. * \param userdata A pointer passed to the callback as-is. @@ -250,7 +250,7 @@ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puse * * const SDL_AssertData *item = SDL_GetAssertionReport(); * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", + * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", * item->condition, item->function, item->filename, * item->linenum, item->trigger_count, * item->always_ignore ? "yes" : "no"); @@ -284,6 +284,6 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); #endif #include "close_code.h" -#endif /* _SDL_assert_h */ +#endif /* SDL_assert_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 56aa81df..5ff96324 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h @@ -56,8 +56,8 @@ * All of the atomic operations that modify memory are full memory barriers. */ -#ifndef _SDL_atomic_h_ -#define _SDL_atomic_h_ +#ifndef SDL_atomic_h_ +#define SDL_atomic_h_ #include "SDL_stdinc.h" #include "SDL_platform.h" @@ -263,6 +263,6 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); #include "close_code.h" -#endif /* _SDL_atomic_h_ */ +#endif /* SDL_atomic_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 d51f0d1c..b445fe50 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h @@ -25,8 +25,8 @@ * Access to the raw audio mixing buffer for the SDL library. */ -#ifndef _SDL_audio_h -#define _SDL_audio_h +#ifndef SDL_audio_h_ +#define SDL_audio_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -667,6 +667,6 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); #endif #include "close_code.h" -#endif /* _SDL_audio_h */ +#endif /* SDL_audio_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 528da2ea..d2b7282d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h @@ -25,8 +25,8 @@ * Functions for fiddling with bits and bitmasks. */ -#ifndef _SDL_bits_h -#define _SDL_bits_h +#ifndef SDL_bits_h_ +#define SDL_bits_h_ #include "SDL_stdinc.h" @@ -92,6 +92,6 @@ SDL_MostSignificantBitIndex32(Uint32 x) #endif #include "close_code.h" -#endif /* _SDL_bits_h */ +#endif /* SDL_bits_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 56d8ad66..a54e04cb 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h @@ -25,8 +25,8 @@ * Header file declaring the SDL_BlendMode enumeration */ -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h +#ifndef SDL_blendmode_h_ +#define SDL_blendmode_h_ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -58,6 +58,6 @@ typedef enum #endif #include "close_code.h" -#endif /* _SDL_blendmode_h */ +#endif /* SDL_blendmode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 a5556f21..dc24e5dd 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h @@ -25,8 +25,8 @@ * Include file for SDL clipboard handling */ -#ifndef _SDL_clipboard_h -#define _SDL_clipboard_h +#ifndef SDL_clipboard_h_ +#define SDL_clipboard_h_ #include "SDL_stdinc.h" @@ -66,6 +66,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); #endif #include "close_code.h" -#endif /* _SDL_clipboard_h */ +#endif /* SDL_clipboard_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 9d1515fb..583b9bd2 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h @@ -20,8 +20,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ /** * \file SDL_config.h.in @@ -174,6 +174,7 @@ #define HAVE_PTHREAD_SETNAME_NP 1 /* #undef HAVE_PTHREAD_SET_NAME_NP */ /* #undef HAVE_SEM_TIMEDWAIT */ +/* #undef HAVE_GETAUXVAL */ #else #define HAVE_STDARG_H 1 @@ -360,4 +361,7 @@ /* Enable ime support */ /* #undef SDL_USE_IME */ -#endif /* _SDL_config_h */ +/* Enable dynamic udev support */ +/* #undef SDL_UDEV_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 4270c78b..ffce187f 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ #include "SDL_platform.h" @@ -29,9 +29,7 @@ */ /* Add any platform that doesn't build using the configure system. */ -#ifdef USING_PREMAKE_CONFIG_H -#include "SDL_config_premake.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "SDL_config_windows.h" #elif defined(__WINRT__) #include "SDL_config_winrt.h" @@ -52,4 +50,4 @@ #error Wrong SDL_config.h, check your include path? #endif -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ 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 996cf76c..b6dc1be7 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_android_h -#define _SDL_config_android_h +#ifndef SDL_config_android_h_ +#define SDL_config_android_h_ #include "SDL_platform.h" @@ -145,4 +145,4 @@ /* Enable the filesystem driver */ #define SDL_FILESYSTEM_ANDROID 1 -#endif /* _SDL_config_android_h */ +#endif /* SDL_config_android_h_ */ 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 470985f8..d912a563 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_iphoneos_h -#define _SDL_config_iphoneos_h +#ifndef SDL_config_iphoneos_h_ +#define SDL_config_iphoneos_h_ #include "SDL_platform.h" @@ -155,4 +155,4 @@ /* enable filesystem support */ #define SDL_FILESYSTEM_COCOA 1 -#endif /* _SDL_config_iphoneos_h */ +#endif /* SDL_config_iphoneos_h_ */ 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 5c8b7e03..07ba0fa9 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_macosx_h -#define _SDL_config_macosx_h +#ifndef SDL_config_macosx_h_ +#define SDL_config_macosx_h_ #include "SDL_platform.h" @@ -185,4 +185,4 @@ #define SDL_ALTIVEC_BLITTERS 1 #endif -#endif /* _SDL_config_macosx_h */ +#endif /* SDL_config_macosx_h_ */ 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 3c9d09af..d1c67164 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_minimal_h -#define _SDL_config_minimal_h +#ifndef SDL_config_minimal_h_ +#define SDL_config_minimal_h_ #include "SDL_platform.h" @@ -78,4 +78,4 @@ typedef unsigned long uintptr_t; /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */ #define SDL_FILESYSTEM_DUMMY 1 -#endif /* _SDL_config_minimal_h */ +#endif /* SDL_config_minimal_h_ */ 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 7b51e571..8ee8d5f3 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ /* This is a set of defines to configure the SDL features */ @@ -124,4 +124,4 @@ #define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1 -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ 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 a6e49609..bf3b58eb 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_psp_h -#define _SDL_config_psp_h +#ifndef SDL_config_psp_h_ +#define SDL_config_psp_h_ #include "SDL_platform.h" @@ -140,4 +140,4 @@ #define SDL_LOADSO_DISABLED 1 -#endif /* _SDL_config_psp_h */ +#endif /* SDL_config_psp_h_ */ 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 4c2c7f62..8c0377d7 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_windows_h -#define _SDL_config_windows_h +#ifndef SDL_config_windows_h_ +#define SDL_config_windows_h_ #include "SDL_platform.h" @@ -218,4 +218,4 @@ typedef unsigned int uintptr_t; #define SDL_ASSEMBLY_ROUTINES 1 #endif -#endif /* _SDL_config_windows_h */ +#endif /* SDL_config_windows_h_ */ 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 e392f773..5a159b6a 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_winrt_h -#define _SDL_config_winrt_h +#ifndef SDL_config_winrt_h_ +#define SDL_config_winrt_h_ #include "SDL_platform.h" @@ -211,4 +211,4 @@ typedef unsigned int uintptr_t; #define SDL_ASSEMBLY_ROUTINES 1 #endif -#endif /* _SDL_config_winrt_h */ +#endif /* SDL_config_winrt_h_ */ 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 e090a1a9..124ca584 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 @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ /* This is a set of defines to configure the SDL features */ @@ -117,4 +117,4 @@ #define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1 -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ 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 d0ba47bf..2d40cb55 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -25,8 +25,8 @@ * CPU feature detection for SDL. */ -#ifndef _SDL_cpuinfo_h -#define _SDL_cpuinfo_h +#ifndef SDL_cpuinfo_h_ +#define SDL_cpuinfo_h_ #include "SDL_stdinc.h" @@ -144,6 +144,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); +/** + * This function returns true if the CPU has NEON (ARM SIMD) features. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); + /** * This function returns the amount of RAM configured in the system, in MB. */ @@ -156,6 +161,6 @@ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); #endif #include "close_code.h" -#endif /* _SDL_cpuinfo_h */ +#endif /* SDL_cpuinfo_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 9100b103..c4ce6157 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h @@ -25,8 +25,8 @@ * Functions for reading and writing endian-specific values */ -#ifndef _SDL_endian_h -#define _SDL_endian_h +#ifndef SDL_endian_h_ +#define SDL_endian_h_ #include "SDL_stdinc.h" @@ -234,6 +234,6 @@ SDL_SwapFloat(float x) #endif #include "close_code.h" -#endif /* _SDL_endian_h */ +#endif /* SDL_endian_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 2f3b4b50..c4e37747 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h @@ -25,8 +25,8 @@ * Simple error message routines for SDL. */ -#ifndef _SDL_error_h -#define _SDL_error_h +#ifndef SDL_error_h_ +#define SDL_error_h_ #include "SDL_stdinc.h" @@ -71,6 +71,6 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code); #endif #include "close_code.h" -#endif /* _SDL_error_h */ +#endif /* SDL_error_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 edb89ef4..83b6c96e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h @@ -25,8 +25,8 @@ * Include file for SDL event handling. */ -#ifndef _SDL_events_h -#define _SDL_events_h +#ifndef SDL_events_h_ +#define SDL_events_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -431,7 +431,7 @@ typedef struct SDL_MultiGestureEvent { Uint32 type; /**< ::SDL_MULTIGESTURE */ Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device index */ + SDL_TouchID touchId; /**< The touch device id */ float dTheta; float dDist; float x; @@ -749,6 +749,6 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); #endif #include "close_code.h" -#endif /* _SDL_events_h */ +#endif /* SDL_events_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 02999ed2..42544a21 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h @@ -25,8 +25,8 @@ * \brief Include file for filesystem SDL API functions */ -#ifndef _SDL_filesystem_h -#define _SDL_filesystem_h +#ifndef SDL_filesystem_h_ +#define SDL_filesystem_h_ #include "SDL_stdinc.h" @@ -131,6 +131,6 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app); #endif #include "close_code.h" -#endif /* _SDL_filesystem_h */ +#endif /* SDL_filesystem_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 a8726282..56051a83 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h @@ -25,8 +25,8 @@ * Include file for SDL game controller event handling */ -#ifndef _SDL_gamecontroller_h -#define _SDL_gamecontroller_h +#ifndef SDL_gamecontroller_h_ +#define SDL_gamecontroller_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -51,7 +51,9 @@ extern "C" { * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS */ -/* The gamecontroller structure used to identify an SDL game controller */ +/** + * The gamecontroller structure used to identify an SDL game controller + */ struct _SDL_GameController; typedef struct _SDL_GameController SDL_GameController; @@ -133,6 +135,20 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); +/** + * Get the number of mappings installed + * + * \return the number of mappings + */ +extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(); + +/** + * Get the mapping at a particular index. + * + * \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range. + */ +extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index); + /** * Get a mapping string for a GUID * @@ -335,6 +351,6 @@ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecon #endif #include "close_code.h" -#endif /* _SDL_gamecontroller_h */ +#endif /* SDL_gamecontroller_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 3c29ca7a..dffb59da 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h @@ -25,8 +25,8 @@ * Include file for SDL gesture event handling. */ -#ifndef _SDL_gesture_h -#define _SDL_gesture_h +#ifndef SDL_gesture_h_ +#define SDL_gesture_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -82,6 +82,6 @@ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWo #endif #include "close_code.h" -#endif /* _SDL_gesture_h */ +#endif /* SDL_gesture_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 9421c8f1..5a2e42ed 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h @@ -104,8 +104,8 @@ * \endcode */ -#ifndef _SDL_haptic_h -#define _SDL_haptic_h +#ifndef SDL_h_aptic_h +#define SDL_h_aptic_h #include "SDL_stdinc.h" #include "SDL_error.h" @@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); #endif #include "close_code.h" -#endif /* _SDL_haptic_h */ +#endif /* SDL_h_aptic_h */ /* vi: set ts=4 sw=4 expandtab: */ 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 dd154643..c2ec2372 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -36,8 +36,8 @@ * to how they would like the library to work. */ -#ifndef _SDL_hints_h -#define _SDL_hints_h +#ifndef SDL_h_ints_h +#define SDL_h_ints_h #include "SDL_stdinc.h" @@ -401,6 +401,33 @@ extern "C" { #define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" +/** + * \brief A variable describing the content orientation on QtWayland-based platforms. + * + * On QtWayland platforms, windows are rotated client-side to allow for custom + * transitions. In order to correctly position overlays (e.g. volume bar) and + * gestures (e.g. events view, close/minimize gestures), the system needs to + * know in which orientation the application is currently drawing its contents. + * + * This does not cause the window to be rotated or resized, the application + * needs to take care of drawing the content in the right orientation (the + * framebuffer is always in portrait mode). + * + * This variable can be one of the following values: + * "primary" (default), "portrait", "landscape", "inverted-portrait", "inverted-landscape" + */ +#define SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION "SDL_QTWAYLAND_CONTENT_ORIENTATION" + +/** + * \brief Flags to set on QtWayland windows to integrate with the native window manager. + * + * On QtWayland platforms, this hint controls the flags to set on the windows. + * For example, on Sailfish OS "OverridesSystemGestures" disables swipe gestures. + * + * This variable is a space-separated list of the following values (empty = no flags): + * "OverridesSystemGestures", "StaysOnTop", "BypassWindowManager" + */ +#define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS" /** * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size @@ -753,6 +780,11 @@ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); */ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); +/** + * \brief type definition of the hint callback function. + */ +typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); + /** * \brief Add a function to watch a particular hint * @@ -760,7 +792,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool d * \param callback The function to call when the hint value changes * \param userdata A pointer to pass to the callback function */ -typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata); @@ -790,6 +821,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void); #endif #include "close_code.h" -#endif /* _SDL_hints_h */ +#endif /* SDL_h_ints_h */ /* vi: set ts=4 sw=4 expandtab: */ 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 6bc40403..7e63870c 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h @@ -36,8 +36,8 @@ * */ -#ifndef _SDL_joystick_h -#define _SDL_joystick_h +#ifndef SDL_joystick_h_ +#define SDL_joystick_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -60,7 +60,9 @@ extern "C" { * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS */ -/* The joystick structure used to identify an SDL joystick */ +/** + * The joystick structure used to identify an SDL joystick + */ struct _SDL_Joystick; typedef struct _SDL_Joystick SDL_Joystick; @@ -308,6 +310,6 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL #endif #include "close_code.h" -#endif /* _SDL_joystick_h */ +#endif /* SDL_joystick_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 f80b6d2d..087bb3af 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h @@ -25,8 +25,8 @@ * Include file for SDL keyboard event handling */ -#ifndef _SDL_keyboard_h -#define _SDL_keyboard_h +#ifndef SDL_keyboard_h_ +#define SDL_keyboard_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -212,6 +212,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); #endif #include "close_code.h" -#endif /* _SDL_keyboard_h */ +#endif /* SDL_keyboard_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 7be96357..8352e623 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h @@ -25,8 +25,8 @@ * Defines constants which identify keyboard keys and modifiers. */ -#ifndef _SDL_keycode_h -#define _SDL_keycode_h +#ifndef SDL_keycode_h_ +#define SDL_keycode_h_ #include "SDL_stdinc.h" #include "SDL_scancode.h" @@ -336,6 +336,6 @@ typedef enum #define KMOD_ALT (KMOD_LALT|KMOD_RALT) #define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) -#endif /* _SDL_keycode_h */ +#endif /* SDL_keycode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 3d540bd7..47173c6b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h @@ -38,8 +38,8 @@ * the results you expect. :) */ -#ifndef _SDL_loadso_h -#define _SDL_loadso_h +#ifndef SDL_loadso_h_ +#define SDL_loadso_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -76,6 +76,6 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); #endif #include "close_code.h" -#endif /* _SDL_loadso_h */ +#endif /* SDL_loadso_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 09be1104..66279e91 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h @@ -34,8 +34,8 @@ * Others: standard error output (stderr) */ -#ifndef _SDL_log_h -#define _SDL_log_h +#ifndef SDL_log_h_ +#define SDL_log_h_ #include "SDL_stdinc.h" @@ -206,6 +206,6 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call #endif #include "close_code.h" -#endif /* _SDL_log_h */ +#endif /* SDL_log_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 67afea5e..f1a007a7 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_main_h -#define _SDL_main_h +#ifndef SDL_main_h_ +#define SDL_main_h_ #include "SDL_stdinc.h" @@ -156,6 +156,6 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v #endif #include "close_code.h" -#endif /* _SDL_main_h */ +#endif /* SDL_main_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 ec370dbb..863e6399 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_messagebox_h -#define _SDL_messagebox_h +#ifndef SDL_messagebox_h_ +#define SDL_messagebox_h_ #include "SDL_stdinc.h" #include "SDL_video.h" /* For SDL_Window */ @@ -139,6 +139,6 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t #endif #include "close_code.h" -#endif /* _SDL_messagebox_h */ +#endif /* SDL_messagebox_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 46f046d0..7aafff32 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h @@ -25,8 +25,8 @@ * Include file for SDL mouse event handling. */ -#ifndef _SDL_mouse_h -#define _SDL_mouse_h +#ifndef SDL_mouse_h_ +#define SDL_mouse_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -297,6 +297,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #endif #include "close_code.h" -#endif /* _SDL_mouse_h */ +#endif /* SDL_mouse_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 b7e39734..661085c3 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_mutex_h -#define _SDL_mutex_h +#ifndef SDL_mutex_h_ +#define SDL_mutex_h_ /** * \file SDL_mutex.h @@ -246,6 +246,6 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, #endif #include "close_code.h" -#endif /* _SDL_mutex_h */ +#endif /* SDL_mutex_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 06cd4a5e..6f553c01 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDLname_h_ -#define _SDLname_h_ +#ifndef SDLname_h_ +#define SDLname_h_ #if defined(__STDC__) || defined(__cplusplus) #define NeedFunctionPrototypes 1 @@ -28,6 +28,6 @@ #define SDL_NAME(X) SDL_##X -#endif /* _SDLname_h_ */ +#endif /* SDLname_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 780919bc..e0d736b7 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h @@ -32,8 +32,8 @@ * version included in SDL_opengl.h. */ -#ifndef _SDL_opengl_h -#define _SDL_opengl_h +#ifndef SDL_opengl_h_ +#define SDL_opengl_h_ #include "SDL_config.h" @@ -2171,6 +2171,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t #endif /* !__IPHONEOS__ */ -#endif /* _SDL_opengl_h */ +#endif /* SDL_opengl_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 cf6a33f0..f2665fa9 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h @@ -25,8 +25,8 @@ * Header for the enumerated pixel format definitions. */ -#ifndef _SDL_pixels_h -#define _SDL_pixels_h +#ifndef SDL_pixels_h_ +#define SDL_pixels_h_ #include "SDL_stdinc.h" #include "SDL_endian.h" @@ -463,6 +463,6 @@ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); #endif #include "close_code.h" -#endif /* _SDL_pixels_h */ +#endif /* SDL_pixels_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 03cf1706..aea66e05 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h @@ -25,8 +25,8 @@ * Try to get a standard set of platform defines. */ -#ifndef _SDL_platform_h -#define _SDL_platform_h +#ifndef SDL_platform_h_ +#define SDL_platform_h_ #if defined(_AIX) #undef __AIX__ @@ -180,6 +180,6 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); #endif #include "close_code.h" -#endif /* _SDL_platform_h */ +#endif /* SDL_platform_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 24c05011..2506a681 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_power_h -#define _SDL_power_h +#ifndef SDL_power_h_ +#define SDL_power_h_ /** * \file SDL_power.h @@ -70,6 +70,6 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); #endif #include "close_code.h" -#endif /* _SDL_power_h */ +#endif /* SDL_power_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 cc06f28d..8e3b1a03 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h @@ -25,8 +25,8 @@ * Include file for SDL quit event handling. */ -#ifndef _SDL_quit_h -#define _SDL_quit_h +#ifndef SDL_quit_h_ +#define SDL_quit_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -55,4 +55,4 @@ #define SDL_QuitRequested() \ (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) -#endif /* _SDL_quit_h */ +#endif /* SDL_quit_h_ */ 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 bbcb9a3b..09fe1a7b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h @@ -25,8 +25,8 @@ * Header file for SDL_rect definition and management functions. */ -#ifndef _SDL_rect_h -#define _SDL_rect_h +#ifndef SDL_rect_h_ +#define SDL_rect_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -143,6 +143,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * #endif #include "close_code.h" -#endif /* _SDL_rect_h */ +#endif /* SDL_rect_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 60c87b66..011a3f29 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h @@ -45,8 +45,8 @@ * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 */ -#ifndef _SDL_render_h -#define _SDL_render_h +#ifndef SDL_render_h_ +#define SDL_render_h_ #include "SDL_stdinc.h" #include "SDL_rect.h" @@ -900,6 +900,6 @@ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); #endif #include "close_code.h" -#endif /* _SDL_render_h */ +#endif /* SDL_render_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 398d6a1a..0b119681 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-10602:20855a38e048" -#define SDL_REVISION_NUMBER 10602 +#define SDL_REVISION "hg-10668:1889c850fafc" +#define SDL_REVISION_NUMBER 10668 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 1ad3ac40..bd0443c6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h @@ -26,8 +26,8 @@ * data streams. It can easily be extended to files, memory, etc. */ -#ifndef _SDL_rwops_h -#define _SDL_rwops_h +#ifndef SDL_rwops_h_ +#define SDL_rwops_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -226,6 +226,6 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); #endif #include "close_code.h" -#endif /* _SDL_rwops_h */ +#endif /* SDL_rwops_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 0af1dd59..b9a57dec 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h @@ -25,8 +25,8 @@ * Defines keyboard scancodes. */ -#ifndef _SDL_scancode_h -#define _SDL_scancode_h +#ifndef SDL_scancode_h_ +#define SDL_scancode_h_ #include "SDL_stdinc.h" @@ -396,6 +396,6 @@ typedef enum for array bounds */ } SDL_Scancode; -#endif /* _SDL_scancode_h */ +#endif /* SDL_scancode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 db10a8f0..df1cf43b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_shape_h -#define _SDL_shape_h +#ifndef SDL_shape_h_ +#define SDL_shape_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -140,4 +140,4 @@ extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_Windo #endif #include "close_code.h" -#endif /* _SDL_shape_h */ +#endif /* SDL_shape_h_ */ 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 fdf96415..517a3712 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -25,8 +25,8 @@ * This is a general header that includes C language support. */ -#ifndef _SDL_stdinc_h -#define _SDL_stdinc_h +#ifndef SDL_stdinc_h_ +#define SDL_stdinc_h_ #include "SDL_config.h" @@ -526,6 +526,6 @@ SDL_FORCE_INLINE void *SDL_memcpy4(SDL_OUT_BYTECAP(dwords*4) void *dst, SDL_IN_B #endif #include "close_code.h" -#endif /* _SDL_stdinc_h */ +#endif /* SDL_stdinc_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 e4a06a20..14c90834 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h @@ -25,8 +25,8 @@ * Header file for ::SDL_Surface definition and management functions. */ -#ifndef _SDL_surface_h -#define _SDL_surface_h +#ifndef SDL_surface_h_ +#define SDL_surface_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -508,6 +508,6 @@ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled #endif #include "close_code.h" -#endif /* _SDL_surface_h */ +#endif /* SDL_surface_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 5da9adb4..35b29c0b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -25,8 +25,8 @@ * Include file for platform specific SDL API functions */ -#ifndef _SDL_system_h -#define _SDL_system_h +#ifndef SDL_system_h_ +#define SDL_system_h_ #include "SDL_stdinc.h" #include "SDL_keyboard.h" @@ -211,6 +211,6 @@ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathT #endif #include "close_code.h" -#endif /* _SDL_system_h */ +#endif /* SDL_system_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 71ba5f1f..f8834d61 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h @@ -25,8 +25,8 @@ * Include file for SDL custom system window manager hooks. */ -#ifndef _SDL_syswm_h -#define _SDL_syswm_h +#ifndef SDL_syswm_h_ +#define SDL_syswm_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -201,6 +201,7 @@ struct SDL_SysWMinfo { HWND window; /**< The window handle */ HDC hdc; /**< The window device context */ + HINSTANCE hinstance; /**< The instance handle */ } win; #endif #if defined(SDL_VIDEO_DRIVER_WINRT) @@ -316,6 +317,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, #endif #include "close_code.h" -#endif /* _SDL_syswm_h */ +#endif /* SDL_syswm_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 377e6c73..b2d5cb31 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_thread_h -#define _SDL_thread_h +#ifndef SDL_thread_h_ +#define SDL_thread_h_ /** * \file SDL_thread.h @@ -282,6 +282,6 @@ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*d #endif #include "close_code.h" -#endif /* _SDL_thread_h */ +#endif /* SDL_thread_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 e0d3785e..c1e9491a 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_timer_h -#define _SDL_timer_h +#ifndef SDL_timer_h_ +#define SDL_timer_h_ /** * \file SDL_timer.h @@ -110,6 +110,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); #endif #include "close_code.h" -#endif /* _SDL_timer_h */ +#endif /* SDL_timer_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 2643e367..982dde3a 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h @@ -25,8 +25,8 @@ * Include file for SDL touch event handling. */ -#ifndef _SDL_touch_h -#define _SDL_touch_h +#ifndef SDL_touch_h_ +#define SDL_touch_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -81,6 +81,6 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int #endif #include "close_code.h" -#endif /* _SDL_touch_h */ +#endif /* SDL_touch_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 1700efdd..4872dc22 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -25,8 +25,8 @@ * This header defines the current SDL version. */ -#ifndef _SDL_version_h -#define _SDL_version_h +#ifndef SDL_version_h_ +#define SDL_version_h_ #include "SDL_stdinc.h" @@ -157,6 +157,6 @@ extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); #endif #include "close_code.h" -#endif /* _SDL_version_h */ +#endif /* SDL_version_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 73c33eb3..402ff1c2 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h @@ -25,8 +25,8 @@ * Header file for SDL video functions. */ -#ifndef _SDL_video_h -#define _SDL_video_h +#ifndef SDL_video_h_ +#define SDL_video_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -1213,6 +1213,6 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); #endif #include "close_code.h" -#endif /* _SDL_video_h */ +#endif /* SDL_video_h_ */ /* vi: set ts=4 sw=4 expandtab: */ 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 04e78c64..2a97ab70 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h @@ -134,6 +134,16 @@ #endif #endif /* SDL_FORCE_INLINE not defined */ +#ifndef SDL_NORETURN +#if defined(__GNUC__) +#define SDL_NORETURN __attribute__((noreturn)) +#elif defined(_MSC_VER) +#define SDL_NORETURN __declspec(noreturn) +#else +#define SDL_NORETURN +#endif +#endif /* SDL_NORETURN not defined */ + /* Apparently this is needed by several Windows compilers */ #if !defined(__MACH__) #ifndef NULL diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 index e003cfa2..a951eaff 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 1a3fa285..8d38eeaa 100644 --- a/quakespasm/Windows/SDL2/include/SDL.h +++ b/quakespasm/Windows/SDL2/include/SDL.h @@ -26,8 +26,8 @@ */ -#ifndef _SDL_H -#define _SDL_H +#ifndef SDL_h_ +#define SDL_h_ #include "SDL_main.h" #include "SDL_stdinc.h" @@ -127,6 +127,6 @@ extern DECLSPEC void SDLCALL SDL_Quit(void); #endif #include "close_code.h" -#endif /* _SDL_H */ +#endif /* SDL_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_assert.h b/quakespasm/Windows/SDL2/include/SDL_assert.h index 402981f9..88d601ba 100644 --- a/quakespasm/Windows/SDL2/include/SDL_assert.h +++ b/quakespasm/Windows/SDL2/include/SDL_assert.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_assert_h -#define _SDL_assert_h +#ifndef SDL_assert_h_ +#define SDL_assert_h_ #include "SDL_config.h" @@ -201,7 +201,7 @@ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)( * * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * - * \return SDL_AssertState value of how to handle the assertion failure. + * Return SDL_AssertState value of how to handle the assertion failure. * * \param handler Callback function, called when an assertion fails. * \param userdata A pointer passed to the callback as-is. @@ -250,7 +250,7 @@ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puse * * const SDL_AssertData *item = SDL_GetAssertionReport(); * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", + * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", * item->condition, item->function, item->filename, * item->linenum, item->trigger_count, * item->always_ignore ? "yes" : "no"); @@ -284,6 +284,6 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); #endif #include "close_code.h" -#endif /* _SDL_assert_h */ +#endif /* SDL_assert_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_atomic.h b/quakespasm/Windows/SDL2/include/SDL_atomic.h index 56aa81df..5ff96324 100644 --- a/quakespasm/Windows/SDL2/include/SDL_atomic.h +++ b/quakespasm/Windows/SDL2/include/SDL_atomic.h @@ -56,8 +56,8 @@ * All of the atomic operations that modify memory are full memory barriers. */ -#ifndef _SDL_atomic_h_ -#define _SDL_atomic_h_ +#ifndef SDL_atomic_h_ +#define SDL_atomic_h_ #include "SDL_stdinc.h" #include "SDL_platform.h" @@ -263,6 +263,6 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); #include "close_code.h" -#endif /* _SDL_atomic_h_ */ +#endif /* SDL_atomic_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_audio.h b/quakespasm/Windows/SDL2/include/SDL_audio.h index d51f0d1c..b445fe50 100644 --- a/quakespasm/Windows/SDL2/include/SDL_audio.h +++ b/quakespasm/Windows/SDL2/include/SDL_audio.h @@ -25,8 +25,8 @@ * Access to the raw audio mixing buffer for the SDL library. */ -#ifndef _SDL_audio_h -#define _SDL_audio_h +#ifndef SDL_audio_h_ +#define SDL_audio_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -667,6 +667,6 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); #endif #include "close_code.h" -#endif /* _SDL_audio_h */ +#endif /* SDL_audio_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_bits.h b/quakespasm/Windows/SDL2/include/SDL_bits.h index 528da2ea..d2b7282d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_bits.h +++ b/quakespasm/Windows/SDL2/include/SDL_bits.h @@ -25,8 +25,8 @@ * Functions for fiddling with bits and bitmasks. */ -#ifndef _SDL_bits_h -#define _SDL_bits_h +#ifndef SDL_bits_h_ +#define SDL_bits_h_ #include "SDL_stdinc.h" @@ -92,6 +92,6 @@ SDL_MostSignificantBitIndex32(Uint32 x) #endif #include "close_code.h" -#endif /* _SDL_bits_h */ +#endif /* SDL_bits_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_blendmode.h b/quakespasm/Windows/SDL2/include/SDL_blendmode.h index 56d8ad66..a54e04cb 100644 --- a/quakespasm/Windows/SDL2/include/SDL_blendmode.h +++ b/quakespasm/Windows/SDL2/include/SDL_blendmode.h @@ -25,8 +25,8 @@ * Header file declaring the SDL_BlendMode enumeration */ -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h +#ifndef SDL_blendmode_h_ +#define SDL_blendmode_h_ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -58,6 +58,6 @@ typedef enum #endif #include "close_code.h" -#endif /* _SDL_blendmode_h */ +#endif /* SDL_blendmode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_clipboard.h b/quakespasm/Windows/SDL2/include/SDL_clipboard.h index a5556f21..dc24e5dd 100644 --- a/quakespasm/Windows/SDL2/include/SDL_clipboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_clipboard.h @@ -25,8 +25,8 @@ * Include file for SDL clipboard handling */ -#ifndef _SDL_clipboard_h -#define _SDL_clipboard_h +#ifndef SDL_clipboard_h_ +#define SDL_clipboard_h_ #include "SDL_stdinc.h" @@ -66,6 +66,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); #endif #include "close_code.h" -#endif /* _SDL_clipboard_h */ +#endif /* SDL_clipboard_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config.h b/quakespasm/Windows/SDL2/include/SDL_config.h index 4051ff4c..ffce187f 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config.h +++ b/quakespasm/Windows/SDL2/include/SDL_config.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ #include "SDL_platform.h" @@ -50,4 +50,4 @@ #error Wrong SDL_config.h, check your include path? #endif -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_android.h b/quakespasm/Windows/SDL2/include/SDL_config_android.h index 996cf76c..b6dc1be7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_android.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_android.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_android_h -#define _SDL_config_android_h +#ifndef SDL_config_android_h_ +#define SDL_config_android_h_ #include "SDL_platform.h" @@ -145,4 +145,4 @@ /* Enable the filesystem driver */ #define SDL_FILESYSTEM_ANDROID 1 -#endif /* _SDL_config_android_h */ +#endif /* SDL_config_android_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h index 470985f8..d912a563 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_iphoneos_h -#define _SDL_config_iphoneos_h +#ifndef SDL_config_iphoneos_h_ +#define SDL_config_iphoneos_h_ #include "SDL_platform.h" @@ -155,4 +155,4 @@ /* enable filesystem support */ #define SDL_FILESYSTEM_COCOA 1 -#endif /* _SDL_config_iphoneos_h */ +#endif /* SDL_config_iphoneos_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h index 5c8b7e03..07ba0fa9 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_macosx_h -#define _SDL_config_macosx_h +#ifndef SDL_config_macosx_h_ +#define SDL_config_macosx_h_ #include "SDL_platform.h" @@ -185,4 +185,4 @@ #define SDL_ALTIVEC_BLITTERS 1 #endif -#endif /* _SDL_config_macosx_h */ +#endif /* SDL_config_macosx_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h index 3c9d09af..d1c67164 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_minimal_h -#define _SDL_config_minimal_h +#ifndef SDL_config_minimal_h_ +#define SDL_config_minimal_h_ #include "SDL_platform.h" @@ -78,4 +78,4 @@ typedef unsigned long uintptr_t; /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */ #define SDL_FILESYSTEM_DUMMY 1 -#endif /* _SDL_config_minimal_h */ +#endif /* SDL_config_minimal_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h index 7b51e571..8ee8d5f3 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ /* This is a set of defines to configure the SDL features */ @@ -124,4 +124,4 @@ #define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1 -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_psp.h b/quakespasm/Windows/SDL2/include/SDL_config_psp.h index a6e49609..bf3b58eb 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_psp.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_psp.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_psp_h -#define _SDL_config_psp_h +#ifndef SDL_config_psp_h_ +#define SDL_config_psp_h_ #include "SDL_platform.h" @@ -140,4 +140,4 @@ #define SDL_LOADSO_DISABLED 1 -#endif /* _SDL_config_psp_h */ +#endif /* SDL_config_psp_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_windows.h b/quakespasm/Windows/SDL2/include/SDL_config_windows.h index 4c2c7f62..8c0377d7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_windows.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_windows.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_windows_h -#define _SDL_config_windows_h +#ifndef SDL_config_windows_h_ +#define SDL_config_windows_h_ #include "SDL_platform.h" @@ -218,4 +218,4 @@ typedef unsigned int uintptr_t; #define SDL_ASSEMBLY_ROUTINES 1 #endif -#endif /* _SDL_config_windows_h */ +#endif /* SDL_config_windows_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h index e392f773..5a159b6a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_winrt_h -#define _SDL_config_winrt_h +#ifndef SDL_config_winrt_h_ +#define SDL_config_winrt_h_ #include "SDL_platform.h" @@ -211,4 +211,4 @@ typedef unsigned int uintptr_t; #define SDL_ASSEMBLY_ROUTINES 1 #endif -#endif /* _SDL_config_winrt_h */ +#endif /* SDL_config_winrt_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h index e090a1a9..124ca584 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_h -#define _SDL_config_h +#ifndef SDL_config_h_ +#define SDL_config_h_ /* This is a set of defines to configure the SDL features */ @@ -117,4 +117,4 @@ #define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1 -#endif /* _SDL_config_h */ +#endif /* SDL_config_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h index d0ba47bf..2d40cb55 100644 --- a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h +++ b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h @@ -25,8 +25,8 @@ * CPU feature detection for SDL. */ -#ifndef _SDL_cpuinfo_h -#define _SDL_cpuinfo_h +#ifndef SDL_cpuinfo_h_ +#define SDL_cpuinfo_h_ #include "SDL_stdinc.h" @@ -144,6 +144,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); +/** + * This function returns true if the CPU has NEON (ARM SIMD) features. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); + /** * This function returns the amount of RAM configured in the system, in MB. */ @@ -156,6 +161,6 @@ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); #endif #include "close_code.h" -#endif /* _SDL_cpuinfo_h */ +#endif /* SDL_cpuinfo_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_endian.h b/quakespasm/Windows/SDL2/include/SDL_endian.h index 9100b103..c4ce6157 100644 --- a/quakespasm/Windows/SDL2/include/SDL_endian.h +++ b/quakespasm/Windows/SDL2/include/SDL_endian.h @@ -25,8 +25,8 @@ * Functions for reading and writing endian-specific values */ -#ifndef _SDL_endian_h -#define _SDL_endian_h +#ifndef SDL_endian_h_ +#define SDL_endian_h_ #include "SDL_stdinc.h" @@ -234,6 +234,6 @@ SDL_SwapFloat(float x) #endif #include "close_code.h" -#endif /* _SDL_endian_h */ +#endif /* SDL_endian_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_error.h b/quakespasm/Windows/SDL2/include/SDL_error.h index 2f3b4b50..c4e37747 100644 --- a/quakespasm/Windows/SDL2/include/SDL_error.h +++ b/quakespasm/Windows/SDL2/include/SDL_error.h @@ -25,8 +25,8 @@ * Simple error message routines for SDL. */ -#ifndef _SDL_error_h -#define _SDL_error_h +#ifndef SDL_error_h_ +#define SDL_error_h_ #include "SDL_stdinc.h" @@ -71,6 +71,6 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code); #endif #include "close_code.h" -#endif /* _SDL_error_h */ +#endif /* SDL_error_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_events.h b/quakespasm/Windows/SDL2/include/SDL_events.h index edb89ef4..83b6c96e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_events.h +++ b/quakespasm/Windows/SDL2/include/SDL_events.h @@ -25,8 +25,8 @@ * Include file for SDL event handling. */ -#ifndef _SDL_events_h -#define _SDL_events_h +#ifndef SDL_events_h_ +#define SDL_events_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -431,7 +431,7 @@ typedef struct SDL_MultiGestureEvent { Uint32 type; /**< ::SDL_MULTIGESTURE */ Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device index */ + SDL_TouchID touchId; /**< The touch device id */ float dTheta; float dDist; float x; @@ -749,6 +749,6 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); #endif #include "close_code.h" -#endif /* _SDL_events_h */ +#endif /* SDL_events_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_filesystem.h b/quakespasm/Windows/SDL2/include/SDL_filesystem.h index 02999ed2..42544a21 100644 --- a/quakespasm/Windows/SDL2/include/SDL_filesystem.h +++ b/quakespasm/Windows/SDL2/include/SDL_filesystem.h @@ -25,8 +25,8 @@ * \brief Include file for filesystem SDL API functions */ -#ifndef _SDL_filesystem_h -#define _SDL_filesystem_h +#ifndef SDL_filesystem_h_ +#define SDL_filesystem_h_ #include "SDL_stdinc.h" @@ -131,6 +131,6 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app); #endif #include "close_code.h" -#endif /* _SDL_filesystem_h */ +#endif /* SDL_filesystem_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h index a8726282..56051a83 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h +++ b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h @@ -25,8 +25,8 @@ * Include file for SDL game controller event handling */ -#ifndef _SDL_gamecontroller_h -#define _SDL_gamecontroller_h +#ifndef SDL_gamecontroller_h_ +#define SDL_gamecontroller_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -51,7 +51,9 @@ extern "C" { * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS */ -/* The gamecontroller structure used to identify an SDL game controller */ +/** + * The gamecontroller structure used to identify an SDL game controller + */ struct _SDL_GameController; typedef struct _SDL_GameController SDL_GameController; @@ -133,6 +135,20 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); +/** + * Get the number of mappings installed + * + * \return the number of mappings + */ +extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(); + +/** + * Get the mapping at a particular index. + * + * \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range. + */ +extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index); + /** * Get a mapping string for a GUID * @@ -335,6 +351,6 @@ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecon #endif #include "close_code.h" -#endif /* _SDL_gamecontroller_h */ +#endif /* SDL_gamecontroller_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_gesture.h b/quakespasm/Windows/SDL2/include/SDL_gesture.h index 3c29ca7a..dffb59da 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gesture.h +++ b/quakespasm/Windows/SDL2/include/SDL_gesture.h @@ -25,8 +25,8 @@ * Include file for SDL gesture event handling. */ -#ifndef _SDL_gesture_h -#define _SDL_gesture_h +#ifndef SDL_gesture_h_ +#define SDL_gesture_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -82,6 +82,6 @@ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWo #endif #include "close_code.h" -#endif /* _SDL_gesture_h */ +#endif /* SDL_gesture_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_haptic.h b/quakespasm/Windows/SDL2/include/SDL_haptic.h index 9421c8f1..5a2e42ed 100644 --- a/quakespasm/Windows/SDL2/include/SDL_haptic.h +++ b/quakespasm/Windows/SDL2/include/SDL_haptic.h @@ -104,8 +104,8 @@ * \endcode */ -#ifndef _SDL_haptic_h -#define _SDL_haptic_h +#ifndef SDL_h_aptic_h +#define SDL_h_aptic_h #include "SDL_stdinc.h" #include "SDL_error.h" @@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); #endif #include "close_code.h" -#endif /* _SDL_haptic_h */ +#endif /* SDL_h_aptic_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_hints.h b/quakespasm/Windows/SDL2/include/SDL_hints.h index dd154643..c2ec2372 100644 --- a/quakespasm/Windows/SDL2/include/SDL_hints.h +++ b/quakespasm/Windows/SDL2/include/SDL_hints.h @@ -36,8 +36,8 @@ * to how they would like the library to work. */ -#ifndef _SDL_hints_h -#define _SDL_hints_h +#ifndef SDL_h_ints_h +#define SDL_h_ints_h #include "SDL_stdinc.h" @@ -401,6 +401,33 @@ extern "C" { #define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" +/** + * \brief A variable describing the content orientation on QtWayland-based platforms. + * + * On QtWayland platforms, windows are rotated client-side to allow for custom + * transitions. In order to correctly position overlays (e.g. volume bar) and + * gestures (e.g. events view, close/minimize gestures), the system needs to + * know in which orientation the application is currently drawing its contents. + * + * This does not cause the window to be rotated or resized, the application + * needs to take care of drawing the content in the right orientation (the + * framebuffer is always in portrait mode). + * + * This variable can be one of the following values: + * "primary" (default), "portrait", "landscape", "inverted-portrait", "inverted-landscape" + */ +#define SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION "SDL_QTWAYLAND_CONTENT_ORIENTATION" + +/** + * \brief Flags to set on QtWayland windows to integrate with the native window manager. + * + * On QtWayland platforms, this hint controls the flags to set on the windows. + * For example, on Sailfish OS "OverridesSystemGestures" disables swipe gestures. + * + * This variable is a space-separated list of the following values (empty = no flags): + * "OverridesSystemGestures", "StaysOnTop", "BypassWindowManager" + */ +#define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS" /** * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size @@ -753,6 +780,11 @@ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); */ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); +/** + * \brief type definition of the hint callback function. + */ +typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); + /** * \brief Add a function to watch a particular hint * @@ -760,7 +792,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool d * \param callback The function to call when the hint value changes * \param userdata A pointer to pass to the callback function */ -typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata); @@ -790,6 +821,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void); #endif #include "close_code.h" -#endif /* _SDL_hints_h */ +#endif /* SDL_h_ints_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_joystick.h b/quakespasm/Windows/SDL2/include/SDL_joystick.h index 6bc40403..7e63870c 100644 --- a/quakespasm/Windows/SDL2/include/SDL_joystick.h +++ b/quakespasm/Windows/SDL2/include/SDL_joystick.h @@ -36,8 +36,8 @@ * */ -#ifndef _SDL_joystick_h -#define _SDL_joystick_h +#ifndef SDL_joystick_h_ +#define SDL_joystick_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -60,7 +60,9 @@ extern "C" { * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS */ -/* The joystick structure used to identify an SDL joystick */ +/** + * The joystick structure used to identify an SDL joystick + */ struct _SDL_Joystick; typedef struct _SDL_Joystick SDL_Joystick; @@ -308,6 +310,6 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL #endif #include "close_code.h" -#endif /* _SDL_joystick_h */ +#endif /* SDL_joystick_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_keyboard.h b/quakespasm/Windows/SDL2/include/SDL_keyboard.h index f80b6d2d..087bb3af 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keyboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_keyboard.h @@ -25,8 +25,8 @@ * Include file for SDL keyboard event handling */ -#ifndef _SDL_keyboard_h -#define _SDL_keyboard_h +#ifndef SDL_keyboard_h_ +#define SDL_keyboard_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -212,6 +212,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); #endif #include "close_code.h" -#endif /* _SDL_keyboard_h */ +#endif /* SDL_keyboard_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_keycode.h b/quakespasm/Windows/SDL2/include/SDL_keycode.h index 7be96357..8352e623 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keycode.h +++ b/quakespasm/Windows/SDL2/include/SDL_keycode.h @@ -25,8 +25,8 @@ * Defines constants which identify keyboard keys and modifiers. */ -#ifndef _SDL_keycode_h -#define _SDL_keycode_h +#ifndef SDL_keycode_h_ +#define SDL_keycode_h_ #include "SDL_stdinc.h" #include "SDL_scancode.h" @@ -336,6 +336,6 @@ typedef enum #define KMOD_ALT (KMOD_LALT|KMOD_RALT) #define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) -#endif /* _SDL_keycode_h */ +#endif /* SDL_keycode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_loadso.h b/quakespasm/Windows/SDL2/include/SDL_loadso.h index 3d540bd7..47173c6b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_loadso.h +++ b/quakespasm/Windows/SDL2/include/SDL_loadso.h @@ -38,8 +38,8 @@ * the results you expect. :) */ -#ifndef _SDL_loadso_h -#define _SDL_loadso_h +#ifndef SDL_loadso_h_ +#define SDL_loadso_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -76,6 +76,6 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); #endif #include "close_code.h" -#endif /* _SDL_loadso_h */ +#endif /* SDL_loadso_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_log.h b/quakespasm/Windows/SDL2/include/SDL_log.h index 09be1104..66279e91 100644 --- a/quakespasm/Windows/SDL2/include/SDL_log.h +++ b/quakespasm/Windows/SDL2/include/SDL_log.h @@ -34,8 +34,8 @@ * Others: standard error output (stderr) */ -#ifndef _SDL_log_h -#define _SDL_log_h +#ifndef SDL_log_h_ +#define SDL_log_h_ #include "SDL_stdinc.h" @@ -206,6 +206,6 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call #endif #include "close_code.h" -#endif /* _SDL_log_h */ +#endif /* SDL_log_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_main.h b/quakespasm/Windows/SDL2/include/SDL_main.h index 67afea5e..f1a007a7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_main.h +++ b/quakespasm/Windows/SDL2/include/SDL_main.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_main_h -#define _SDL_main_h +#ifndef SDL_main_h_ +#define SDL_main_h_ #include "SDL_stdinc.h" @@ -156,6 +156,6 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v #endif #include "close_code.h" -#endif /* _SDL_main_h */ +#endif /* SDL_main_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_messagebox.h b/quakespasm/Windows/SDL2/include/SDL_messagebox.h index ec370dbb..863e6399 100644 --- a/quakespasm/Windows/SDL2/include/SDL_messagebox.h +++ b/quakespasm/Windows/SDL2/include/SDL_messagebox.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_messagebox_h -#define _SDL_messagebox_h +#ifndef SDL_messagebox_h_ +#define SDL_messagebox_h_ #include "SDL_stdinc.h" #include "SDL_video.h" /* For SDL_Window */ @@ -139,6 +139,6 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t #endif #include "close_code.h" -#endif /* _SDL_messagebox_h */ +#endif /* SDL_messagebox_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_mouse.h b/quakespasm/Windows/SDL2/include/SDL_mouse.h index 46f046d0..7aafff32 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mouse.h +++ b/quakespasm/Windows/SDL2/include/SDL_mouse.h @@ -25,8 +25,8 @@ * Include file for SDL mouse event handling. */ -#ifndef _SDL_mouse_h -#define _SDL_mouse_h +#ifndef SDL_mouse_h_ +#define SDL_mouse_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -297,6 +297,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #endif #include "close_code.h" -#endif /* _SDL_mouse_h */ +#endif /* SDL_mouse_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_mutex.h b/quakespasm/Windows/SDL2/include/SDL_mutex.h index b7e39734..661085c3 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mutex.h +++ b/quakespasm/Windows/SDL2/include/SDL_mutex.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_mutex_h -#define _SDL_mutex_h +#ifndef SDL_mutex_h_ +#define SDL_mutex_h_ /** * \file SDL_mutex.h @@ -246,6 +246,6 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, #endif #include "close_code.h" -#endif /* _SDL_mutex_h */ +#endif /* SDL_mutex_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_name.h b/quakespasm/Windows/SDL2/include/SDL_name.h index 06cd4a5e..6f553c01 100644 --- a/quakespasm/Windows/SDL2/include/SDL_name.h +++ b/quakespasm/Windows/SDL2/include/SDL_name.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDLname_h_ -#define _SDLname_h_ +#ifndef SDLname_h_ +#define SDLname_h_ #if defined(__STDC__) || defined(__cplusplus) #define NeedFunctionPrototypes 1 @@ -28,6 +28,6 @@ #define SDL_NAME(X) SDL_##X -#endif /* _SDLname_h_ */ +#endif /* SDLname_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_opengl.h b/quakespasm/Windows/SDL2/include/SDL_opengl.h index 780919bc..e0d736b7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengl.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengl.h @@ -32,8 +32,8 @@ * version included in SDL_opengl.h. */ -#ifndef _SDL_opengl_h -#define _SDL_opengl_h +#ifndef SDL_opengl_h_ +#define SDL_opengl_h_ #include "SDL_config.h" @@ -2171,6 +2171,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t #endif /* !__IPHONEOS__ */ -#endif /* _SDL_opengl_h */ +#endif /* SDL_opengl_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_pixels.h b/quakespasm/Windows/SDL2/include/SDL_pixels.h index cf6a33f0..f2665fa9 100644 --- a/quakespasm/Windows/SDL2/include/SDL_pixels.h +++ b/quakespasm/Windows/SDL2/include/SDL_pixels.h @@ -25,8 +25,8 @@ * Header for the enumerated pixel format definitions. */ -#ifndef _SDL_pixels_h -#define _SDL_pixels_h +#ifndef SDL_pixels_h_ +#define SDL_pixels_h_ #include "SDL_stdinc.h" #include "SDL_endian.h" @@ -463,6 +463,6 @@ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); #endif #include "close_code.h" -#endif /* _SDL_pixels_h */ +#endif /* SDL_pixels_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_platform.h b/quakespasm/Windows/SDL2/include/SDL_platform.h index 03cf1706..aea66e05 100644 --- a/quakespasm/Windows/SDL2/include/SDL_platform.h +++ b/quakespasm/Windows/SDL2/include/SDL_platform.h @@ -25,8 +25,8 @@ * Try to get a standard set of platform defines. */ -#ifndef _SDL_platform_h -#define _SDL_platform_h +#ifndef SDL_platform_h_ +#define SDL_platform_h_ #if defined(_AIX) #undef __AIX__ @@ -180,6 +180,6 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); #endif #include "close_code.h" -#endif /* _SDL_platform_h */ +#endif /* SDL_platform_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_power.h b/quakespasm/Windows/SDL2/include/SDL_power.h index 24c05011..2506a681 100644 --- a/quakespasm/Windows/SDL2/include/SDL_power.h +++ b/quakespasm/Windows/SDL2/include/SDL_power.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_power_h -#define _SDL_power_h +#ifndef SDL_power_h_ +#define SDL_power_h_ /** * \file SDL_power.h @@ -70,6 +70,6 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); #endif #include "close_code.h" -#endif /* _SDL_power_h */ +#endif /* SDL_power_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_quit.h b/quakespasm/Windows/SDL2/include/SDL_quit.h index cc06f28d..8e3b1a03 100644 --- a/quakespasm/Windows/SDL2/include/SDL_quit.h +++ b/quakespasm/Windows/SDL2/include/SDL_quit.h @@ -25,8 +25,8 @@ * Include file for SDL quit event handling. */ -#ifndef _SDL_quit_h -#define _SDL_quit_h +#ifndef SDL_quit_h_ +#define SDL_quit_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -55,4 +55,4 @@ #define SDL_QuitRequested() \ (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) -#endif /* _SDL_quit_h */ +#endif /* SDL_quit_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_rect.h b/quakespasm/Windows/SDL2/include/SDL_rect.h index bbcb9a3b..09fe1a7b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rect.h +++ b/quakespasm/Windows/SDL2/include/SDL_rect.h @@ -25,8 +25,8 @@ * Header file for SDL_rect definition and management functions. */ -#ifndef _SDL_rect_h -#define _SDL_rect_h +#ifndef SDL_rect_h_ +#define SDL_rect_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -143,6 +143,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * #endif #include "close_code.h" -#endif /* _SDL_rect_h */ +#endif /* SDL_rect_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_render.h b/quakespasm/Windows/SDL2/include/SDL_render.h index 60c87b66..011a3f29 100644 --- a/quakespasm/Windows/SDL2/include/SDL_render.h +++ b/quakespasm/Windows/SDL2/include/SDL_render.h @@ -45,8 +45,8 @@ * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 */ -#ifndef _SDL_render_h -#define _SDL_render_h +#ifndef SDL_render_h_ +#define SDL_render_h_ #include "SDL_stdinc.h" #include "SDL_rect.h" @@ -900,6 +900,6 @@ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); #endif #include "close_code.h" -#endif /* _SDL_render_h */ +#endif /* SDL_render_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_revision.h b/quakespasm/Windows/SDL2/include/SDL_revision.h index 398d6a1a..0b119681 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-10602:20855a38e048" -#define SDL_REVISION_NUMBER 10602 +#define SDL_REVISION "hg-10668:1889c850fafc" +#define SDL_REVISION_NUMBER 10668 diff --git a/quakespasm/Windows/SDL2/include/SDL_rwops.h b/quakespasm/Windows/SDL2/include/SDL_rwops.h index 1ad3ac40..bd0443c6 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rwops.h +++ b/quakespasm/Windows/SDL2/include/SDL_rwops.h @@ -26,8 +26,8 @@ * data streams. It can easily be extended to files, memory, etc. */ -#ifndef _SDL_rwops_h -#define _SDL_rwops_h +#ifndef SDL_rwops_h_ +#define SDL_rwops_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -226,6 +226,6 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); #endif #include "close_code.h" -#endif /* _SDL_rwops_h */ +#endif /* SDL_rwops_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_scancode.h b/quakespasm/Windows/SDL2/include/SDL_scancode.h index 0af1dd59..b9a57dec 100644 --- a/quakespasm/Windows/SDL2/include/SDL_scancode.h +++ b/quakespasm/Windows/SDL2/include/SDL_scancode.h @@ -25,8 +25,8 @@ * Defines keyboard scancodes. */ -#ifndef _SDL_scancode_h -#define _SDL_scancode_h +#ifndef SDL_scancode_h_ +#define SDL_scancode_h_ #include "SDL_stdinc.h" @@ -396,6 +396,6 @@ typedef enum for array bounds */ } SDL_Scancode; -#endif /* _SDL_scancode_h */ +#endif /* SDL_scancode_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_shape.h b/quakespasm/Windows/SDL2/include/SDL_shape.h index db10a8f0..df1cf43b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_shape.h +++ b/quakespasm/Windows/SDL2/include/SDL_shape.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_shape_h -#define _SDL_shape_h +#ifndef SDL_shape_h_ +#define SDL_shape_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -140,4 +140,4 @@ extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_Windo #endif #include "close_code.h" -#endif /* _SDL_shape_h */ +#endif /* SDL_shape_h_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_stdinc.h b/quakespasm/Windows/SDL2/include/SDL_stdinc.h index fdf96415..517a3712 100644 --- a/quakespasm/Windows/SDL2/include/SDL_stdinc.h +++ b/quakespasm/Windows/SDL2/include/SDL_stdinc.h @@ -25,8 +25,8 @@ * This is a general header that includes C language support. */ -#ifndef _SDL_stdinc_h -#define _SDL_stdinc_h +#ifndef SDL_stdinc_h_ +#define SDL_stdinc_h_ #include "SDL_config.h" @@ -526,6 +526,6 @@ SDL_FORCE_INLINE void *SDL_memcpy4(SDL_OUT_BYTECAP(dwords*4) void *dst, SDL_IN_B #endif #include "close_code.h" -#endif /* _SDL_stdinc_h */ +#endif /* SDL_stdinc_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_surface.h b/quakespasm/Windows/SDL2/include/SDL_surface.h index e4a06a20..14c90834 100644 --- a/quakespasm/Windows/SDL2/include/SDL_surface.h +++ b/quakespasm/Windows/SDL2/include/SDL_surface.h @@ -25,8 +25,8 @@ * Header file for ::SDL_Surface definition and management functions. */ -#ifndef _SDL_surface_h -#define _SDL_surface_h +#ifndef SDL_surface_h_ +#define SDL_surface_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -508,6 +508,6 @@ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled #endif #include "close_code.h" -#endif /* _SDL_surface_h */ +#endif /* SDL_surface_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_system.h b/quakespasm/Windows/SDL2/include/SDL_system.h index 5da9adb4..35b29c0b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_system.h +++ b/quakespasm/Windows/SDL2/include/SDL_system.h @@ -25,8 +25,8 @@ * Include file for platform specific SDL API functions */ -#ifndef _SDL_system_h -#define _SDL_system_h +#ifndef SDL_system_h_ +#define SDL_system_h_ #include "SDL_stdinc.h" #include "SDL_keyboard.h" @@ -211,6 +211,6 @@ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathT #endif #include "close_code.h" -#endif /* _SDL_system_h */ +#endif /* SDL_system_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_syswm.h b/quakespasm/Windows/SDL2/include/SDL_syswm.h index 71ba5f1f..f8834d61 100644 --- a/quakespasm/Windows/SDL2/include/SDL_syswm.h +++ b/quakespasm/Windows/SDL2/include/SDL_syswm.h @@ -25,8 +25,8 @@ * Include file for SDL custom system window manager hooks. */ -#ifndef _SDL_syswm_h -#define _SDL_syswm_h +#ifndef SDL_syswm_h_ +#define SDL_syswm_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -201,6 +201,7 @@ struct SDL_SysWMinfo { HWND window; /**< The window handle */ HDC hdc; /**< The window device context */ + HINSTANCE hinstance; /**< The instance handle */ } win; #endif #if defined(SDL_VIDEO_DRIVER_WINRT) @@ -316,6 +317,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, #endif #include "close_code.h" -#endif /* _SDL_syswm_h */ +#endif /* SDL_syswm_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_thread.h b/quakespasm/Windows/SDL2/include/SDL_thread.h index 377e6c73..b2d5cb31 100644 --- a/quakespasm/Windows/SDL2/include/SDL_thread.h +++ b/quakespasm/Windows/SDL2/include/SDL_thread.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_thread_h -#define _SDL_thread_h +#ifndef SDL_thread_h_ +#define SDL_thread_h_ /** * \file SDL_thread.h @@ -282,6 +282,6 @@ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*d #endif #include "close_code.h" -#endif /* _SDL_thread_h */ +#endif /* SDL_thread_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_timer.h b/quakespasm/Windows/SDL2/include/SDL_timer.h index e0d3785e..c1e9491a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_timer.h +++ b/quakespasm/Windows/SDL2/include/SDL_timer.h @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_timer_h -#define _SDL_timer_h +#ifndef SDL_timer_h_ +#define SDL_timer_h_ /** * \file SDL_timer.h @@ -110,6 +110,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); #endif #include "close_code.h" -#endif /* _SDL_timer_h */ +#endif /* SDL_timer_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_touch.h b/quakespasm/Windows/SDL2/include/SDL_touch.h index 2643e367..982dde3a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_touch.h +++ b/quakespasm/Windows/SDL2/include/SDL_touch.h @@ -25,8 +25,8 @@ * Include file for SDL touch event handling. */ -#ifndef _SDL_touch_h -#define _SDL_touch_h +#ifndef SDL_touch_h_ +#define SDL_touch_h_ #include "SDL_stdinc.h" #include "SDL_error.h" @@ -81,6 +81,6 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int #endif #include "close_code.h" -#endif /* _SDL_touch_h */ +#endif /* SDL_touch_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_version.h b/quakespasm/Windows/SDL2/include/SDL_version.h index 1700efdd..4872dc22 100644 --- a/quakespasm/Windows/SDL2/include/SDL_version.h +++ b/quakespasm/Windows/SDL2/include/SDL_version.h @@ -25,8 +25,8 @@ * This header defines the current SDL version. */ -#ifndef _SDL_version_h -#define _SDL_version_h +#ifndef SDL_version_h_ +#define SDL_version_h_ #include "SDL_stdinc.h" @@ -157,6 +157,6 @@ extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); #endif #include "close_code.h" -#endif /* _SDL_version_h */ +#endif /* SDL_version_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/SDL_video.h b/quakespasm/Windows/SDL2/include/SDL_video.h index 73c33eb3..402ff1c2 100644 --- a/quakespasm/Windows/SDL2/include/SDL_video.h +++ b/quakespasm/Windows/SDL2/include/SDL_video.h @@ -25,8 +25,8 @@ * Header file for SDL video functions. */ -#ifndef _SDL_video_h -#define _SDL_video_h +#ifndef SDL_video_h_ +#define SDL_video_h_ #include "SDL_stdinc.h" #include "SDL_pixels.h" @@ -1213,6 +1213,6 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); #endif #include "close_code.h" -#endif /* _SDL_video_h */ +#endif /* SDL_video_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/quakespasm/Windows/SDL2/include/begin_code.h b/quakespasm/Windows/SDL2/include/begin_code.h index 04e78c64..2a97ab70 100644 --- a/quakespasm/Windows/SDL2/include/begin_code.h +++ b/quakespasm/Windows/SDL2/include/begin_code.h @@ -134,6 +134,16 @@ #endif #endif /* SDL_FORCE_INLINE not defined */ +#ifndef SDL_NORETURN +#if defined(__GNUC__) +#define SDL_NORETURN __attribute__((noreturn)) +#elif defined(_MSC_VER) +#define SDL_NORETURN __declspec(noreturn) +#else +#define SDL_NORETURN +#endif +#endif /* SDL_NORETURN not defined */ + /* Apparently this is needed by several Windows compilers */ #if !defined(__MACH__) #ifndef NULL diff --git a/quakespasm/Windows/SDL2/lib/SDL2.dll b/quakespasm/Windows/SDL2/lib/SDL2.dll index 2a8c6d93..5bab9144 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 40ca6e88..d8b545c8 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 4e960fa9..9f864b65 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 a2b33c25..484f0366 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 8f9ae3c5..1be32594 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 84b9eca1..dc308180 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 b511c626..d8a54005 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 420120fc..5cbe8eb6 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 3eff9f61..eab45e2f 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 0bbe5e5a..61beb642 100644 Binary files a/quakespasm/Windows/SDL2/lib64/libSDL2main.a and b/quakespasm/Windows/SDL2/lib64/libSDL2main.a differ