diff --git a/bin_win32/SDL2.dll b/bin_win32/SDL2.dll index c21f747c..a25b05a0 100755 Binary files a/bin_win32/SDL2.dll and b/bin_win32/SDL2.dll differ diff --git a/source/include/SDL.h b/source/include/SDL.h index 366d50fa..d48d9d4a 100755 --- a/source/include/SDL.h +++ b/source/include/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_assert.h b/source/include/SDL_assert.h index 90abbe39..b38f928a 100755 --- a/source/include/SDL_assert.h +++ b/source/include/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_atomic.h b/source/include/SDL_atomic.h index 36e37f3b..b2287748 100755 --- a/source/include/SDL_atomic.h +++ b/source/include/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -158,6 +158,9 @@ extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); #if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") +#elif defined(__GNUC__) && defined(__aarch64__) +#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") +#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") #elif defined(__GNUC__) && defined(__arm__) #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") diff --git a/source/include/SDL_audio.h b/source/include/SDL_audio.h index f119c2b2..d6ea6895 100755 --- a/source/include/SDL_audio.h +++ b/source/include/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -527,7 +527,7 @@ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioForm * * \param stream The stream the audio data is being added to * \param buf A pointer to the audio data to add - * \param int The number of bytes to write to the stream + * \param len The number of bytes to write to the stream * \return 0 on success, or -1 on error. * * \sa SDL_NewAudioStream diff --git a/source/include/SDL_bits.h b/source/include/SDL_bits.h index bc285729..eb8322f0 100755 --- a/source/include/SDL_bits.h +++ b/source/include/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_blendmode.h b/source/include/SDL_blendmode.h index 9abd0bd4..36a5ea76 100755 --- a/source/include/SDL_blendmode.h +++ b/source/include/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_clipboard.h b/source/include/SDL_clipboard.h index 341f4ba4..f28751eb 100755 --- a/source/include/SDL_clipboard.h +++ b/source/include/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_config.h b/source/include/SDL_config.h old mode 100755 new mode 100644 index 1bbb8384..7e0340cd --- a/source/include/SDL_config.h +++ b/source/include/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,216 +19,35 @@ 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_h_ #define SDL_config_h_ #include "SDL_platform.h" -/* This is a set of defines to configure the SDL features */ +/** + * \file SDL_config.h + */ -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) -#define HAVE_STDINT_H 1 -#elif defined(_MSC_VER) -typedef signed __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef signed __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef signed __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; +/* Add any platform that doesn't build using the configure system. */ +#if defined(__WIN32__) +#include "SDL_config_windows.h" +#elif defined(__WINRT__) +#include "SDL_config_winrt.h" +#elif defined(__MACOSX__) +#include "SDL_config_macosx.h" +#elif defined(__IPHONEOS__) +#include "SDL_config_iphoneos.h" +#elif defined(__ANDROID__) +#include "SDL_config_android.h" +#elif defined(__PSP__) +#include "SDL_config_psp.h" #else -typedef unsigned int uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif -/* Older Visual C++ headers don't have the Win64-compatible typedefs... */ -#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR))) -#define DWORD_PTR DWORD -#endif -#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR))) -#define LONG_PTR LONG -#endif -#else /* !__GNUC__ && !_MSC_VER */ -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; -#ifndef _SIZE_T_DEFINED_ -#define _SIZE_T_DEFINED_ -typedef unsigned int size_t; -#endif -typedef unsigned int uintptr_t; -#endif /* __GNUC__ || _MSC_VER */ -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ +/* This is a minimal configuration just to get SDL running on new platforms */ +#include "SDL_config_minimal.h" +#endif /* platform config */ -#ifdef _WIN64 -# define SIZEOF_VOIDP 8 -#else -# define SIZEOF_VOIDP 4 +#ifdef USING_GENERATED_CONFIG_H +#error Wrong SDL_config.h, check your include path? #endif -#define HAVE_DDRAW_H 1 -#define HAVE_DINPUT_H 1 -#define HAVE_DSOUND_H 1 -#define HAVE_DXGI_H 1 -#define HAVE_XINPUT_H 1 - -/* This is disabled by default to avoid C runtime dependencies and manifest requirements */ -#ifdef HAVE_LIBC -/* Useful headers */ -#define STDC_HEADERS 1 -#define HAVE_CTYPE_H 1 -#define HAVE_FLOAT_H 1 -#define HAVE_LIMITS_H 1 -#define HAVE_MATH_H 1 -#define HAVE_SIGNAL_H 1 -#define HAVE_STDIO_H 1 -#define HAVE_STRING_H 1 - -/* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 -#define HAVE_ALLOCA 1 -#define HAVE_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE__STRREV 1 -#define HAVE__STRUPR 1 -#define HAVE__STRLWR 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE__LTOA 1 -#define HAVE__ULTOA 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE__STRICMP 1 -#define HAVE__STRNICMP 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 -#define HAVE_CEIL 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_POW 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SQRTF 1 -#define HAVE_TAN 1 -#define HAVE_TANF 1 -#define HAVE__COPYSIGN 1 -#if defined(_MSC_VER) -/* These functions were added with the VC++ 2013 C runtime library */ -#if _MSC_VER >= 1800 -#define HAVE_STRTOLL 1 -#define HAVE_VSSCANF 1 -#define HAVE_SCALBN 1 -#endif -/* This function is available with at least the VC++ 2008 C runtime library */ -#if _MSC_VER >= 1400 -#define HAVE__FSEEKI64 1 -#endif -#endif -#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES) -#define HAVE_M_PI 1 -#endif -#else -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 -#endif - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_WASAPI 1 -#define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_XAUDIO2 0 -#define SDL_AUDIO_DRIVER_WINMM 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_DINPUT 1 -#define SDL_JOYSTICK_XINPUT 1 -#define SDL_HAPTIC_DINPUT 1 -#define SDL_HAPTIC_XINPUT 1 - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_WINDOWS 1 - -/* Enable various threading systems */ -#define SDL_THREAD_WINDOWS 1 - -/* Enable various timer systems */ -#define SDL_TIMER_WINDOWS 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_DUMMY 1 -#define SDL_VIDEO_DRIVER_WINDOWS 1 - -#ifndef SDL_VIDEO_RENDER_D3D -#define SDL_VIDEO_RENDER_D3D 1 -#endif -#ifndef SDL_VIDEO_RENDER_D3D11 -#define SDL_VIDEO_RENDER_D3D11 0 -#endif - -/* Enable OpenGL support */ -#ifndef SDL_VIDEO_OPENGL -#define SDL_VIDEO_OPENGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_WGL -#define SDL_VIDEO_OPENGL_WGL 1 -#endif -#ifndef SDL_VIDEO_RENDER_OGL -#define SDL_VIDEO_RENDER_OGL 1 -#endif -#ifndef SDL_VIDEO_RENDER_OGL_ES2 -#define SDL_VIDEO_RENDER_OGL_ES2 1 -#endif -#ifndef SDL_VIDEO_OPENGL_ES2 -#define SDL_VIDEO_OPENGL_ES2 1 -#endif -#ifndef SDL_VIDEO_OPENGL_EGL -#define SDL_VIDEO_OPENGL_EGL 1 -#endif - -/* Enable Vulkan support */ -#define SDL_VIDEO_VULKAN 1 - -/* Enable system power support */ -#define SDL_POWER_WINDOWS 1 - -/* Enable filesystem support */ -#define SDL_FILESYSTEM_WINDOWS 1 - -/* Enable assembly routines (Win64 doesn't have inline asm) */ -#ifndef _WIN64 -#define SDL_ASSEMBLY_ROUTINES 1 -#endif - -#endif /* SDL_config_windows_h_ */ +#endif /* SDL_config_h_ */ diff --git a/source/include/SDL_config_macosx.h b/source/include/SDL_config_macosx.h new file mode 100644 index 00000000..29f583e1 --- /dev/null +++ b/source/include/SDL_config_macosx.h @@ -0,0 +1,234 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2018 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef SDL_config_macosx_h_ +#define SDL_config_macosx_h_ +#define SDL_config_h_ + +#include "SDL_platform.h" + +/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ +#include + +/* This is a set of defines to configure the SDL features */ + +#ifdef __LP64__ + #define SIZEOF_VOIDP 8 +#else + #define SIZEOF_VOIDP 4 +#endif + +/* Useful headers */ +#define STDC_HEADERS 1 +#define HAVE_ALLOCA_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_LIBUNWIND_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_GETENV 1 +#define HAVE_SETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRNCASECMP 1 +#define HAVE_VSSCANF 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_M_PI 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 +#define HAVE_ATAN2F 1 +#define HAVE_CEIL 1 +#define HAVE_CEILF 1 +#define HAVE_COPYSIGN 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_COS 1 +#define HAVE_COSF 1 +#define HAVE_FABS 1 +#define HAVE_FABSF 1 +#define HAVE_FLOOR 1 +#define HAVE_FLOORF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 +#define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 +#define HAVE_LOG10F 1 +#define HAVE_POW 1 +#define HAVE_POWF 1 +#define HAVE_SCALBN 1 +#define HAVE_SCALBNF 1 +#define HAVE_SIN 1 +#define HAVE_SINF 1 +#define HAVE_SQRT 1 +#define HAVE_SQRTF 1 +#define HAVE_TAN 1 +#define HAVE_TANF 1 +#define HAVE_SIGACTION 1 +#define HAVE_SETJMP 1 +#define HAVE_NANOSLEEP 1 +#define HAVE_SYSCONF 1 +#define HAVE_SYSCTLBYNAME 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_COREAUDIO 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable various input drivers */ +#define SDL_JOYSTICK_IOKIT 1 +#define SDL_HAPTIC_IOKIT 1 + +/* Enable various shared object loading systems */ +#define SDL_LOADSO_DLOPEN 1 + +/* Enable various threading systems */ +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 + +/* Enable various timer systems */ +#define SDL_TIMER_UNIX 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_COCOA 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 +#undef SDL_VIDEO_DRIVER_X11 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib" +#define SDL_VIDEO_DRIVER_X11_XDBE 1 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 +#define SDL_VIDEO_DRIVER_X11_XRANDR 1 +#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 +#define SDL_VIDEO_DRIVER_X11_XSHAPE 1 +#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1 +#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 + +#ifdef MAC_OS_X_VERSION_10_8 +/* + * No matter the versions targeted, this is the 10.8 or later SDK, so you have + * to use the external Xquartz, which is a more modern Xlib. Previous SDKs + * used an older Xlib. + */ +#define SDL_VIDEO_DRIVER_X11_XINPUT2 1 +#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 +#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1 +#endif + +#ifndef SDL_VIDEO_RENDER_OGL +#define SDL_VIDEO_RENDER_OGL 1 +#endif + +#ifndef SDL_VIDEO_RENDER_OGL_ES2 +#define SDL_VIDEO_RENDER_OGL_ES2 1 +#endif + +#ifndef SDL_VIDEO_RENDER_METAL +/* Metal only supported on 64-bit architectures with 10.11+ */ +#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) +#define SDL_VIDEO_RENDER_METAL 1 +#else +#define SDL_VIDEO_RENDER_METAL 0 +#endif +#endif + +/* Enable OpenGL support */ +#ifndef SDL_VIDEO_OPENGL +#define SDL_VIDEO_OPENGL 1 +#endif +#ifndef SDL_VIDEO_OPENGL_ES2 +#define SDL_VIDEO_OPENGL_ES2 1 +#endif +#ifndef SDL_VIDEO_OPENGL_EGL +#define SDL_VIDEO_OPENGL_EGL 1 +#endif +#ifndef SDL_VIDEO_OPENGL_CGL +#define SDL_VIDEO_OPENGL_CGL 1 +#endif +#ifndef SDL_VIDEO_OPENGL_GLX +#define SDL_VIDEO_OPENGL_GLX 1 +#endif + +/* Enable Vulkan support */ +/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures with 10.11+ */ +#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) +#define SDL_VIDEO_VULKAN 1 +#else +#define SDL_VIDEO_VULKAN 0 +#endif + +/* Enable system power support */ +#define SDL_POWER_MACOSX 1 + +/* enable filesystem support */ +#define SDL_FILESYSTEM_COCOA 1 + +/* Enable assembly routines */ +#define SDL_ASSEMBLY_ROUTINES 1 +#ifdef __ppc__ +#define SDL_ALTIVEC_BLITTERS 1 +#endif + +#endif /* SDL_config_macosx_h_ */ diff --git a/source/include/SDL_config_windows.h b/source/include/SDL_config_windows.h old mode 100755 new mode 100644 index 2456c843..52a9ece1 --- a/source/include/SDL_config_windows.h +++ b/source/include/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -86,12 +86,14 @@ typedef unsigned int uintptr_t; /* This is disabled by default to avoid C runtime dependencies and manifest requirements */ #ifdef HAVE_LIBC /* Useful headers */ -#define HAVE_STDIO_H 1 #define STDC_HEADERS 1 -#define HAVE_STRING_H 1 #define HAVE_CTYPE_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STRING_H 1 /* C library functions */ #define HAVE_MALLOC 1 @@ -107,13 +109,15 @@ typedef unsigned int uintptr_t; #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 #define HAVE__STRREV 1 -#define HAVE__STRUPR 1 -#define HAVE__STRLWR 1 +/* These functions have security warnings, so we won't use them */ +/* #undef HAVE__STRUPR */ +/* #undef HAVE__STRLWR */ #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 -#define HAVE__LTOA 1 -#define HAVE__ULTOA 1 +/* These functions have security warnings, so we won't use them */ +/* #undef HAVE__LTOA */ +/* #undef HAVE__ULTOA */ #define HAVE_STRTOL 1 #define HAVE_STRTOUL 1 #define HAVE_STRTOD 1 @@ -123,28 +127,48 @@ typedef unsigned int uintptr_t; #define HAVE_STRNCMP 1 #define HAVE__STRICMP 1 #define HAVE__STRNICMP 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 -#define HAVE_CEIL 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_POW 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SQRTF 1 -#define HAVE_TAN 1 -#define HAVE_TANF 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 +#define HAVE_ATAN2F 1 +#define HAVE_CEILF 1 +#define HAVE__COPYSIGN 1 +#define HAVE_COS 1 +#define HAVE_COSF 1 +#define HAVE_FABS 1 +#define HAVE_FABSF 1 +#define HAVE_FLOOR 1 +#define HAVE_FLOORF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 +#define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 +#define HAVE_LOG10F 1 +#define HAVE_POW 1 +#define HAVE_POWF 1 +#define HAVE_SIN 1 +#define HAVE_SINF 1 +#define HAVE_SQRT 1 +#define HAVE_SQRTF 1 +#define HAVE_TAN 1 +#define HAVE_TANF 1 +#if defined(_MSC_VER) +/* These functions were added with the VC++ 2013 C runtime library */ #if _MSC_VER >= 1800 #define HAVE_STRTOLL 1 #define HAVE_VSSCANF 1 -#define HAVE_COPYSIGN 1 #define HAVE_SCALBN 1 +#define HAVE_SCALBNF 1 +#endif +/* This function is available with at least the VC++ 2008 C runtime library */ +#if _MSC_VER >= 1400 +#define HAVE__FSEEKI64 1 +#endif #endif #if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES) #define HAVE_M_PI 1 @@ -157,7 +181,6 @@ typedef unsigned int uintptr_t; /* Enable various audio drivers */ #define SDL_AUDIO_DRIVER_WASAPI 1 #define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_XAUDIO2 0 #define SDL_AUDIO_DRIVER_WINMM 1 #define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DUMMY 1 @@ -185,7 +208,7 @@ typedef unsigned int uintptr_t; #define SDL_VIDEO_RENDER_D3D 1 #endif #ifndef SDL_VIDEO_RENDER_D3D11 -#define SDL_VIDEO_RENDER_D3D11 0 +#define SDL_VIDEO_RENDER_D3D11 0 #endif /* Enable OpenGL support */ diff --git a/source/include/SDL_copying.h b/source/include/SDL_copying.h old mode 100755 new mode 100644 index 8f60af6b..15616ace --- a/source/include/SDL_copying.h +++ b/source/include/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_cpuinfo.h b/source/include/SDL_cpuinfo.h index 94b64b03..08127053 100755 --- a/source/include/SDL_cpuinfo.h +++ b/source/include/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,27 +51,32 @@ #include #else #ifdef __ALTIVEC__ -#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) +#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H) #include #undef pixel +#undef bool #endif #endif -#ifdef __MMX__ -#include -#endif -#ifdef __3dNOW__ +#if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif -#ifdef __SSE__ +#if HAVE_IMMINTRIN_H && !defined(SDL_DISABLE_IMMINTRIN_H) +#include +#else +#if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H) +#include +#endif +#if defined(__SSE__) && !defined(SDL_DISABLE_XMMINTRIN_H) #include #endif -#ifdef __SSE2__ +#if defined(__SSE2__) && !defined(SDL_DISABLE_EMMINTRIN_H) #include #endif -#ifdef __SSE3__ +#if defined(__SSE3__) && !defined(SDL_DISABLE_PMMINTRIN_H) #include #endif -#endif +#endif /* HAVE_IMMINTRIN_H */ +#endif /* compiler version */ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/source/include/SDL_endian.h b/source/include/SDL_endian.h index 3eda7f28..ed0bf5ba 100755 --- a/source/include/SDL_endian.h +++ b/source/include/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_error.h b/source/include/SDL_error.h index 49be9827..c0e46298 100755 --- a/source/include/SDL_error.h +++ b/source/include/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_events.h b/source/include/SDL_events.h index 0fc09bc3..3d39e6a7 100755 --- a/source/include/SDL_events.h +++ b/source/include/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_filesystem.h b/source/include/SDL_filesystem.h index a1c846ad..fa6a1fa6 100755 --- a/source/include/SDL_filesystem.h +++ b/source/include/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_gamecontroller.h b/source/include/SDL_gamecontroller.h index c9215132..2e024be6 100755 --- a/source/include/SDL_gamecontroller.h +++ b/source/include/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_gesture.h b/source/include/SDL_gesture.h index 2bba6a72..b223d80d 100755 --- a/source/include/SDL_gesture.h +++ b/source/include/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_haptic.h b/source/include/SDL_haptic.h index 60daefaa..e3a2bca5 100755 --- a/source/include/SDL_haptic.h +++ b/source/include/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_hints.h b/source/include/SDL_hints.h index 007a4bee..3834640f 100755 --- a/source/include/SDL_hints.h +++ b/source/include/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,6 +76,7 @@ extern "C" { * "opengl" * "opengles2" * "opengles" + * "metal" * "software" * * The default varies by platform, but it's the first one in the list that @@ -210,6 +211,18 @@ extern "C" { */ #define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" +/** + * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_BYPASS_COMPOSITOR + * "1" - Enable _NET_WM_BYPASS_COMPOSITOR + * + * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * + */ +#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" + /** * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden * @@ -355,16 +368,36 @@ extern "C" { #define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" /** - * \brief A variable controlling whether the Android / iOS built-in - * accelerometer should be listed as a joystick device, rather than listing - * actual joysticks only. + * \brief A variable controlling whether the home indicator bar on iPhone X + * should be hidden. * * This variable can be set to the following values: - * "0" - List only real joysticks and accept input from them - * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). + * "0" - The indicator bar is not hidden (default for windowed applications) + * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) + * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + */ +#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" + +/** + * \brief A variable controlling whether the Android / iOS built-in + * accelerometer should be listed as a joystick device. + * + * This variable can be set to the following values: + * "0" - The accelerometer is not listed as a joystick + * "1" - The accelerometer is available as a 3 axis joystick (the default). */ #define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" +/** + * \brief A variable controlling whether the Android / tvOS remotes + * should be listed as joystick devices, instead of sending keyboard events. + * + * This variable can be set to the following values: + * "0" - Remotes send enter/escape/arrow key events + * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + */ +#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" + /** * \brief A variable that lets you disable the detection and use of Xinput gamepad devices * @@ -719,6 +752,18 @@ extern "C" { */ #define SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH "SDL_ANDROID_SEPARATE_MOUSE_AND_TOUCH" + /** + * \brief A variable to control whether the return key on the soft keyboard + * should hide the soft keyboard on Android and iOS. + * + * The variable can be set to the following values: + * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) + * "1" - The return key will hide the keyboard. + * + * The value of this hint is used at runtime, so it can be changed at any time. + */ +#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" + /** * \brief override the binding element for keyboard inputs for Emscripten builds * @@ -752,7 +797,7 @@ extern "C" { * "0" - SDL will generate a window-close event when it sees Alt+F4. * "1" - SDL will only do normal key handling for Alt+F4. */ -#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" +#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" /** * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. @@ -797,6 +842,24 @@ extern "C" { */ #define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" +/** + * \brief Tell the video driver that we only want a double buffer. + * + * By default, most lowlevel 2D APIs will use a triple buffer scheme that + * wastes no CPU time on waiting for vsync after issuing a flip, but + * introduces a frame of latency. On the other hand, using a double buffer + * scheme instead is recommended for cases where low latency is an important + * factor because we save a whole frame of latency. + * We do so by waiting for vsync immediately after issuing a flip, usually just + * after eglSwapBuffers call in the backend's *_SwapWindow function. + * + * Since it's driver-specific, it's only supported where possible and + * implemented. Currently supported the following drivers: + * - KMSDRM (kmsdrm) + * - Raspberry Pi (raspberrypi) + */ +#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" + /** * \brief A variable controlling what driver to use for OpenGL ES contexts. * diff --git a/source/include/SDL_joystick.h b/source/include/SDL_joystick.h index f598dc82..f67772d7 100755 --- a/source/include/SDL_joystick.h +++ b/source/include/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_keyboard.h b/source/include/SDL_keyboard.h index e78ca469..87482317 100755 --- a/source/include/SDL_keyboard.h +++ b/source/include/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_keycode.h b/source/include/SDL_keycode.h index c41e45ff..d7d5b1db 100755 --- a/source/include/SDL_keycode.h +++ b/source/include/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_loadso.h b/source/include/SDL_loadso.h index 6ea256c6..da56fb45 100755 --- a/source/include/SDL_loadso.h +++ b/source/include/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_log.h b/source/include/SDL_log.h index 356d0e1c..e12b6588 100755 --- a/source/include/SDL_log.h +++ b/source/include/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_main.h b/source/include/SDL_main.h index 2af32360..98558217 100755 --- a/source/include/SDL_main.h +++ b/source/include/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -63,10 +63,13 @@ /* On Android SDL provides a Java class in SDLActivity.java that is the main activity entry point. - See README-android.md for more details on extending that class. + See docs/README-android.md for more details on extending that class. */ #define SDL_MAIN_NEEDED +/* We need to export SDL_main so it can be launched from Java */ +#define SDLMAIN_DECLSPEC DECLSPEC + #elif defined(__NACL__) /* On NACL we use ppapi_simple to set up the application helper code, then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before @@ -85,6 +88,10 @@ #define C_LINKAGE #endif /* __cplusplus */ +#ifndef SDLMAIN_DECLSPEC +#define SDLMAIN_DECLSPEC +#endif + /** * \file SDL_main.h * @@ -107,7 +114,7 @@ /** * The prototype for the application's main() function */ -extern C_LINKAGE DECLSPEC int SDL_main(int argc, char *argv[]); +extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); #include "begin_code.h" diff --git a/source/include/SDL_messagebox.h b/source/include/SDL_messagebox.h index c326d8f0..b7be59d8 100755 --- a/source/include/SDL_messagebox.h +++ b/source/include/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_mouse.h b/source/include/SDL_mouse.h index 6001bd46..d3c9f615 100755 --- a/source/include/SDL_mouse.h +++ b/source/include/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_mutex.h b/source/include/SDL_mutex.h index 0272379e..ba4247ce 100755 --- a/source/include/SDL_mutex.h +++ b/source/include/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_name.h b/source/include/SDL_name.h index 8095ed3f..ecd863f4 100755 --- a/source/include/SDL_name.h +++ b/source/include/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_opengl.h b/source/include/SDL_opengl.h index 314dd57e..253d9c93 100755 --- a/source/include/SDL_opengl.h +++ b/source/include/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_opengl_glext.h b/source/include/SDL_opengl_glext.h old mode 100644 new mode 100755 diff --git a/source/include/SDL_pixels.h b/source/include/SDL_pixels.h index 04246689..0b4364b1 100755 --- a/source/include/SDL_pixels.h +++ b/source/include/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -287,7 +287,9 @@ enum SDL_PIXELFORMAT_NV12 = /**< Planar mode: Y + U/V interleaved (2 planes) */ SDL_DEFINE_PIXELFOURCC('N', 'V', '1', '2'), SDL_PIXELFORMAT_NV21 = /**< Planar mode: Y + V/U interleaved (2 planes) */ - SDL_DEFINE_PIXELFOURCC('N', 'V', '2', '1') + SDL_DEFINE_PIXELFOURCC('N', 'V', '2', '1'), + SDL_PIXELFORMAT_EXTERNAL_OES = /**< Android video texture format */ + SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ') }; typedef struct SDL_Color diff --git a/source/include/SDL_platform.h b/source/include/SDL_platform.h index 9dde385f..7dea4ce9 100755 --- a/source/include/SDL_platform.h +++ b/source/include/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -121,7 +121,12 @@ #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) /* Try to find out if we're compiling for WinRT or non-WinRT */ #if defined(_MSC_VER) && defined(__has_include) -#define HAVE_WINAPIFAMILY_H __has_include() +#if __has_include() +#define HAVE_WINAPIFAMILY_H 1 +#else +#define HAVE_WINAPIFAMILY_H 0 +#endif + /* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */ #elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */ #define HAVE_WINAPIFAMILY_H 1 diff --git a/source/include/SDL_power.h b/source/include/SDL_power.h index d48e8a37..a4fe8a93 100755 --- a/source/include/SDL_power.h +++ b/source/include/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_quit.h b/source/include/SDL_quit.h index 9283c381..fea56a8d 100755 --- a/source/include/SDL_quit.h +++ b/source/include/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_rect.h b/source/include/SDL_rect.h index c4f6d74b..543bb618 100755 --- a/source/include/SDL_rect.h +++ b/source/include/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_render.h b/source/include/SDL_render.h index ea6ef9ff..d3361929 100755 --- a/source/include/SDL_render.h +++ b/source/include/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -898,6 +898,27 @@ extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw */ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); +/** + * \brief Get the CAMetalLayer associated with the given Metal renderer + * + * \param renderer The renderer to query + * + * \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer + * + * \sa SDL_RenderGetMetalCommandEncoder() + */ +extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer); + +/** + * \brief Get the Metal command encoder for the current frame + * + * \param renderer The renderer to query + * + * \return id on success, or NULL if the renderer isn't a Metal renderer + * + * \sa SDL_RenderGetMetalLayer() + */ +extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/source/include/SDL_revision.h b/source/include/SDL_revision.h index 9376093e..dbe9b97d 100755 --- a/source/include/SDL_revision.h +++ b/source/include/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-11645:2088cd828335" -#define SDL_REVISION_NUMBER 11645 +#define SDL_REVISION "hg-11914:f1084c419f33" +#define SDL_REVISION_NUMBER 11914 diff --git a/source/include/SDL_rwops.h b/source/include/SDL_rwops.h index 7f0cbdfd..0960699d 100755 --- a/source/include/SDL_rwops.h +++ b/source/include/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_scancode.h b/source/include/SDL_scancode.h index 1d552120..63871aa3 100755 --- a/source/include/SDL_scancode.h +++ b/source/include/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_shape.h b/source/include/SDL_shape.h index 9e492d93..40a6baaa 100755 --- a/source/include/SDL_shape.h +++ b/source/include/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_stdinc.h b/source/include/SDL_stdinc.h index 72402299..111a0645 100755 --- a/source/include/SDL_stdinc.h +++ b/source/include/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -501,18 +501,33 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size #endif extern DECLSPEC double SDLCALL SDL_acos(double x); +extern DECLSPEC float SDLCALL SDL_acosf(float x); extern DECLSPEC double SDLCALL SDL_asin(double x); +extern DECLSPEC float SDLCALL SDL_asinf(float x); extern DECLSPEC double SDLCALL SDL_atan(double x); +extern DECLSPEC float SDLCALL SDL_atanf(float x); extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); +extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y); extern DECLSPEC double SDLCALL SDL_ceil(double x); +extern DECLSPEC float SDLCALL SDL_ceilf(float x); extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); +extern DECLSPEC float SDLCALL SDL_copysignf(float x, float y); extern DECLSPEC double SDLCALL SDL_cos(double x); extern DECLSPEC float SDLCALL SDL_cosf(float x); extern DECLSPEC double SDLCALL SDL_fabs(double x); +extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); +extern DECLSPEC float SDLCALL SDL_floorf(float x); +extern DECLSPEC double SDLCALL SDL_fmod(double x, double y); +extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y); extern DECLSPEC double SDLCALL SDL_log(double x); +extern DECLSPEC float SDLCALL SDL_logf(float x); +extern DECLSPEC double SDLCALL SDL_log10(double x); +extern DECLSPEC float SDLCALL SDL_log10f(float x); extern DECLSPEC double SDLCALL SDL_pow(double x, double y); +extern DECLSPEC float SDLCALL SDL_powf(float x, float y); extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); +extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n); extern DECLSPEC double SDLCALL SDL_sin(double x); extern DECLSPEC float SDLCALL SDL_sinf(float x); extern DECLSPEC double SDLCALL SDL_sqrt(double x); diff --git a/source/include/SDL_surface.h b/source/include/SDL_surface.h index 510690c9..45e5366f 100755 --- a/source/include/SDL_surface.h +++ b/source/include/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -97,6 +97,17 @@ typedef struct SDL_Surface typedef int (SDLCALL *SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, struct SDL_Surface * dst, SDL_Rect * dstrect); +/** + * \brief The formula used for converting between YUV and RGB + */ +typedef enum +{ + SDL_YUV_CONVERSION_JPEG, /**< Full range JPEG */ + SDL_YUV_CONVERSION_BT601, /**< BT.601 (the default) */ + SDL_YUV_CONVERSION_BT709, /**< BT.709 */ + SDL_YUV_CONVERSION_AUTOMATIC /**< BT.601 for SD content, BT.709 for HD content */ +} SDL_YUV_CONVERSION_MODE; + /** * Allocate and free an RGB surface. * @@ -509,6 +520,20 @@ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); +/** + * \brief Set the YUV conversion mode + */ +extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode); + +/** + * \brief Get the YUV conversion mode + */ +extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void); + +/** + * \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + */ +extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/source/include/SDL_system.h b/source/include/SDL_system.h index eb069b33..7b776fdf 100755 --- a/source/include/SDL_system.h +++ b/source/include/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -108,6 +108,11 @@ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void); */ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); +/** + \brief Return true if the application is running on Android TV + */ +extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); + /** See the official Android developer guide for more information: http://developer.android.com/guide/topics/data/data-storage.html @@ -169,6 +174,25 @@ typedef enum } SDL_WinRT_Path; +/** + * \brief WinRT Device Family + */ +typedef enum +{ + /** \brief Unknown family */ + SDL_WINRT_DEVICEFAMILY_UNKNOWN, + + /** \brief Desktop family*/ + SDL_WINRT_DEVICEFAMILY_DESKTOP, + + /** \brief Mobile family (for example smartphone) */ + SDL_WINRT_DEVICEFAMILY_MOBILE, + + /** \brief XBox family */ + SDL_WINRT_DEVICEFAMILY_XBOX, +} SDL_WinRT_DeviceFamily; + + /** * \brief Retrieves a WinRT defined path on the local file system * @@ -203,6 +227,13 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path */ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); +/** + * \brief Detects the device family of WinRT plattform on runtime + * + * \return Device family + */ +extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); + #endif /* __WINRT__ */ /* Ends C function definitions when using C++ */ diff --git a/source/include/SDL_syswm.h b/source/include/SDL_syswm.h index 2d18afb6..8aa4a39e 100755 --- a/source/include/SDL_syswm.h +++ b/source/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_thread.h b/source/include/SDL_thread.h index d0f6575c..82a43fc0 100755 --- a/source/include/SDL_thread.h +++ b/source/include/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_timer.h b/source/include/SDL_timer.h index 282625d3..5600618f 100755 --- a/source/include/SDL_timer.h +++ b/source/include/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_touch.h b/source/include/SDL_touch.h index db9e25eb..f4075e79 100755 --- a/source/include/SDL_touch.h +++ b/source/include/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_types.h b/source/include/SDL_types.h index 06ee80cb..4ac248c8 100755 --- a/source/include/SDL_types.h +++ b/source/include/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/SDL_version.h b/source/include/SDL_version.h index 5b4c4024..584b48c7 100755 --- a/source/include/SDL_version.h +++ b/source/include/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 7 +#define SDL_PATCHLEVEL 8 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/source/include/SDL_video.h b/source/include/SDL_video.h index 6f6cda8b..83f49faa 100755 --- a/source/include/SDL_video.h +++ b/source/include/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -110,7 +110,9 @@ typedef enum SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */ SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ), SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ - SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000, /**< window should be created in high-DPI mode if supported */ + SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000, /**< window should be created in high-DPI mode if supported. + On macOS NSHighResolutionCapable must be set true in the + application's Info.plist for this to have any effect. */ SDL_WINDOW_MOUSE_CAPTURE = 0x00004000, /**< window has mouse captured (unrelated to INPUT_GRABBED) */ SDL_WINDOW_ALWAYS_ON_TOP = 0x00008000, /**< window should always be above others */ SDL_WINDOW_SKIP_TASKBAR = 0x00010000, /**< window should not be added to the taskbar */ @@ -470,7 +472,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * If the window is created with any of the SDL_WINDOW_OPENGL or * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the - * corrensponding UnloadLibrary function is called by SDL_DestroyWindow(). + * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). * * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. diff --git a/source/include/SDL_vulkan.h b/source/include/SDL_vulkan.h index 803b5fee..f04c21ad 100755 --- a/source/include/SDL_vulkan.h +++ b/source/include/SDL_vulkan.h @@ -69,30 +69,43 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \brief Dynamically load a Vulkan loader library. * * \param [in] path The platform dependent Vulkan loader library name, or - * \c NULL to open the default Vulkan loader library. + * \c NULL. * * \return \c 0 on success, or \c -1 if the library couldn't be loaded. * - * This should be done after initializing the video driver, but before + * If \a path is NULL SDL will use the value of the environment variable + * \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan + * loader library. + * + * This should be called after initializing the video driver, but before * creating any Vulkan windows. If no Vulkan loader library is loaded, the * default library will be loaded upon creation of the first Vulkan window. * - * \note If you specify a non-NULL \a path, you should retrieve all of the - * Vulkan functions used in your program from the dynamic library using + * \note It is fairly common for Vulkan applications to link with \a libvulkan + * instead of explicitly loading it at run time. This will work with + * SDL provided the application links to a dynamic library and both it + * and SDL use the same search path. + * + * \note If you specify a non-NULL \c path, an application should retrieve all + * of the Vulkan functions it uses from the dynamic library using * \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee - * \a path points to the same vulkan loader library that you linked to. + * \c path points to the same vulkan loader library the application + * linked to. * * \note On Apple devices, if \a path is NULL, SDL will attempt to find * the vkGetInstanceProcAddr address within all the mach-o images of - * the current process. This is because the currently (v0.17.0) - * recommended MoltenVK (Vulkan on Metal) usage is as a static library. - * If it is not found then SDL will attempt to load \c libMoltenVK.dylib. - * Applications using the dylib alternative therefore do not need to do - * anything special when calling SDL. + * the current process. This is because it is fairly common for Vulkan + * applications to link with libvulkan (and historically MoltenVK was + * provided as a static library). If it is not found then, on macOS, SDL + * will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib, + * \c MoltenVK.framework/MoltenVK and \c libMoltenVK.dylib in that order. + * On iOS SDL will attempt to load \c libMoltenVK.dylib. Applications + * using a dynamic framework or .dylib must ensure it is included in its + * application bundle. * - * \note On non-Apple devices, SDL requires you to either not link to the - * Vulkan loader or link to a dynamic library version. This limitation - * may be removed in a future version of SDL. + * \note On non-Apple devices, application linking with a static libvulkan is + * not supported. Either do not link to the Vulkan loader or link to a + * dynamic library version. * * \note This function will fail if there are no working Vulkan drivers * installed. @@ -240,6 +253,9 @@ extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface( * platform with high-DPI support (Apple calls this "Retina"), and not disabled * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. * + * \note On macOS high-DPI support must be enabled for an application by + * setting NSHighResolutionCapable to true in its Info.plist. + * * \sa SDL_GetWindowSize() * \sa SDL_CreateWindow() */ diff --git a/source/include/begin_code.h b/source/include/begin_code.h index 5372d6f0..6c210624 100755 --- a/source/include/begin_code.h +++ b/source/include/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/include/close_code.h b/source/include/close_code.h index 2a352dbb..b3b70a4c 100755 --- a/source/include/close_code.h +++ b/source/include/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/lib/SDL2.lib b/source/lib/SDL2.lib index a36fab5a..034efbd9 100755 Binary files a/source/lib/SDL2.lib and b/source/lib/SDL2.lib differ diff --git a/source/lib/SDL2main.lib b/source/lib/SDL2main.lib index 2080d5db..965a7dea 100755 Binary files a/source/lib/SDL2main.lib and b/source/lib/SDL2main.lib differ diff --git a/source/xcode/Frameworks/SDL2.framework/Headers b/source/xcode/Frameworks/SDL2.framework/Headers deleted file mode 100644 index a177d2a6..00000000 --- a/source/xcode/Frameworks/SDL2.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/source/xcode/Frameworks/SDL2.framework/Headers b/source/xcode/Frameworks/SDL2.framework/Headers new file mode 120000 index 00000000..a177d2a6 --- /dev/null +++ b/source/xcode/Frameworks/SDL2.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/source/xcode/Frameworks/SDL2.framework/Resources b/source/xcode/Frameworks/SDL2.framework/Resources deleted file mode 100644 index 953ee36f..00000000 --- a/source/xcode/Frameworks/SDL2.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/source/xcode/Frameworks/SDL2.framework/Resources b/source/xcode/Frameworks/SDL2.framework/Resources new file mode 120000 index 00000000..953ee36f --- /dev/null +++ b/source/xcode/Frameworks/SDL2.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h index 366d50fa..d48d9d4a 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h index 90abbe39..b38f928a 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h index 36e37f3b..b2287748 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -158,6 +158,9 @@ extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); #if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") #define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") +#elif defined(__GNUC__) && defined(__aarch64__) +#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") +#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") #elif defined(__GNUC__) && defined(__arm__) #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) #define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h index f119c2b2..d6ea6895 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -527,7 +527,7 @@ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioForm * * \param stream The stream the audio data is being added to * \param buf A pointer to the audio data to add - * \param int The number of bytes to write to the stream + * \param len The number of bytes to write to the stream * \return 0 on success, or -1 on error. * * \sa SDL_NewAudioStream diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h index bc285729..eb8322f0 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h index 9abd0bd4..36a5ea76 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h index 341f4ba4..f28751eb 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h index 41f5baab..7e0340cd 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h index f7550789..29f583e1 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -87,15 +87,35 @@ #define HAVE_STRNCASECMP 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 +#define HAVE_M_PI 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 +#define HAVE_ATAN2F 1 #define HAVE_CEIL 1 +#define HAVE_CEILF 1 #define HAVE_COPYSIGN 1 +#define HAVE_COPYSIGNF 1 #define HAVE_COS 1 #define HAVE_COSF 1 #define HAVE_FABS 1 +#define HAVE_FABSF 1 #define HAVE_FLOOR 1 +#define HAVE_FLOORF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 #define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 +#define HAVE_LOG10F 1 #define HAVE_POW 1 +#define HAVE_POWF 1 #define HAVE_SCALBN 1 +#define HAVE_SCALBNF 1 #define HAVE_SIN 1 #define HAVE_SINF 1 #define HAVE_SQRT 1 @@ -107,10 +127,6 @@ #define HAVE_NANOSLEEP 1 #define HAVE_SYSCONF 1 #define HAVE_SYSCTLBYNAME 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 /* Enable various audio drivers */ #define SDL_AUDIO_DRIVER_COREAUDIO 1 @@ -165,10 +181,29 @@ #define SDL_VIDEO_RENDER_OGL 1 #endif +#ifndef SDL_VIDEO_RENDER_OGL_ES2 +#define SDL_VIDEO_RENDER_OGL_ES2 1 +#endif + +#ifndef SDL_VIDEO_RENDER_METAL +/* Metal only supported on 64-bit architectures with 10.11+ */ +#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) +#define SDL_VIDEO_RENDER_METAL 1 +#else +#define SDL_VIDEO_RENDER_METAL 0 +#endif +#endif + /* Enable OpenGL support */ #ifndef SDL_VIDEO_OPENGL #define SDL_VIDEO_OPENGL 1 #endif +#ifndef SDL_VIDEO_OPENGL_ES2 +#define SDL_VIDEO_OPENGL_ES2 1 +#endif +#ifndef SDL_VIDEO_OPENGL_EGL +#define SDL_VIDEO_OPENGL_EGL 1 +#endif #ifndef SDL_VIDEO_OPENGL_CGL #define SDL_VIDEO_OPENGL_CGL 1 #endif @@ -181,7 +216,7 @@ #if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) #define SDL_VIDEO_VULKAN 1 #else -#define SDL_VIDEO_VULKAN 0 +#define SDL_VIDEO_VULKAN 0 #endif /* Enable system power support */ diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h index 8f60af6b..15616ace 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h index 94b64b03..08127053 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,27 +51,32 @@ #include #else #ifdef __ALTIVEC__ -#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) +#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H) #include #undef pixel +#undef bool #endif #endif -#ifdef __MMX__ -#include -#endif -#ifdef __3dNOW__ +#if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif -#ifdef __SSE__ +#if HAVE_IMMINTRIN_H && !defined(SDL_DISABLE_IMMINTRIN_H) +#include +#else +#if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H) +#include +#endif +#if defined(__SSE__) && !defined(SDL_DISABLE_XMMINTRIN_H) #include #endif -#ifdef __SSE2__ +#if defined(__SSE2__) && !defined(SDL_DISABLE_EMMINTRIN_H) #include #endif -#ifdef __SSE3__ +#if defined(__SSE3__) && !defined(SDL_DISABLE_PMMINTRIN_H) #include #endif -#endif +#endif /* HAVE_IMMINTRIN_H */ +#endif /* compiler version */ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h index 3eda7f28..ed0bf5ba 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h index 49be9827..c0e46298 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h index 0fc09bc3..3d39e6a7 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h index a1c846ad..fa6a1fa6 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h index c9215132..2e024be6 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h index 2bba6a72..b223d80d 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h index 60daefaa..e3a2bca5 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h index 007a4bee..3834640f 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,6 +76,7 @@ extern "C" { * "opengl" * "opengles2" * "opengles" + * "metal" * "software" * * The default varies by platform, but it's the first one in the list that @@ -210,6 +211,18 @@ extern "C" { */ #define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" +/** + * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_BYPASS_COMPOSITOR + * "1" - Enable _NET_WM_BYPASS_COMPOSITOR + * + * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * + */ +#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" + /** * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden * @@ -355,16 +368,36 @@ extern "C" { #define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" /** - * \brief A variable controlling whether the Android / iOS built-in - * accelerometer should be listed as a joystick device, rather than listing - * actual joysticks only. + * \brief A variable controlling whether the home indicator bar on iPhone X + * should be hidden. * * This variable can be set to the following values: - * "0" - List only real joysticks and accept input from them - * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). + * "0" - The indicator bar is not hidden (default for windowed applications) + * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) + * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + */ +#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" + +/** + * \brief A variable controlling whether the Android / iOS built-in + * accelerometer should be listed as a joystick device. + * + * This variable can be set to the following values: + * "0" - The accelerometer is not listed as a joystick + * "1" - The accelerometer is available as a 3 axis joystick (the default). */ #define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" +/** + * \brief A variable controlling whether the Android / tvOS remotes + * should be listed as joystick devices, instead of sending keyboard events. + * + * This variable can be set to the following values: + * "0" - Remotes send enter/escape/arrow key events + * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + */ +#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" + /** * \brief A variable that lets you disable the detection and use of Xinput gamepad devices * @@ -719,6 +752,18 @@ extern "C" { */ #define SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH "SDL_ANDROID_SEPARATE_MOUSE_AND_TOUCH" + /** + * \brief A variable to control whether the return key on the soft keyboard + * should hide the soft keyboard on Android and iOS. + * + * The variable can be set to the following values: + * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) + * "1" - The return key will hide the keyboard. + * + * The value of this hint is used at runtime, so it can be changed at any time. + */ +#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" + /** * \brief override the binding element for keyboard inputs for Emscripten builds * @@ -752,7 +797,7 @@ extern "C" { * "0" - SDL will generate a window-close event when it sees Alt+F4. * "1" - SDL will only do normal key handling for Alt+F4. */ -#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" +#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" /** * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. @@ -797,6 +842,24 @@ extern "C" { */ #define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" +/** + * \brief Tell the video driver that we only want a double buffer. + * + * By default, most lowlevel 2D APIs will use a triple buffer scheme that + * wastes no CPU time on waiting for vsync after issuing a flip, but + * introduces a frame of latency. On the other hand, using a double buffer + * scheme instead is recommended for cases where low latency is an important + * factor because we save a whole frame of latency. + * We do so by waiting for vsync immediately after issuing a flip, usually just + * after eglSwapBuffers call in the backend's *_SwapWindow function. + * + * Since it's driver-specific, it's only supported where possible and + * implemented. Currently supported the following drivers: + * - KMSDRM (kmsdrm) + * - Raspberry Pi (raspberrypi) + */ +#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" + /** * \brief A variable controlling what driver to use for OpenGL ES contexts. * diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h index f598dc82..f67772d7 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h index e78ca469..87482317 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h index c41e45ff..d7d5b1db 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h index 6ea256c6..da56fb45 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h index 356d0e1c..e12b6588 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h index 2af32360..98558217 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -63,10 +63,13 @@ /* On Android SDL provides a Java class in SDLActivity.java that is the main activity entry point. - See README-android.md for more details on extending that class. + See docs/README-android.md for more details on extending that class. */ #define SDL_MAIN_NEEDED +/* We need to export SDL_main so it can be launched from Java */ +#define SDLMAIN_DECLSPEC DECLSPEC + #elif defined(__NACL__) /* On NACL we use ppapi_simple to set up the application helper code, then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before @@ -85,6 +88,10 @@ #define C_LINKAGE #endif /* __cplusplus */ +#ifndef SDLMAIN_DECLSPEC +#define SDLMAIN_DECLSPEC +#endif + /** * \file SDL_main.h * @@ -107,7 +114,7 @@ /** * The prototype for the application's main() function */ -extern C_LINKAGE DECLSPEC int SDL_main(int argc, char *argv[]); +extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); #include "begin_code.h" diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h index c326d8f0..b7be59d8 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h index 6001bd46..d3c9f615 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h index 0272379e..ba4247ce 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h index 8095ed3f..ecd863f4 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h index 314dd57e..253d9c93 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h index 800c5930..18dd984b 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h index 102f2f3f..6ccecf21 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h index 04246689..0b4364b1 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -287,7 +287,9 @@ enum SDL_PIXELFORMAT_NV12 = /**< Planar mode: Y + U/V interleaved (2 planes) */ SDL_DEFINE_PIXELFOURCC('N', 'V', '1', '2'), SDL_PIXELFORMAT_NV21 = /**< Planar mode: Y + V/U interleaved (2 planes) */ - SDL_DEFINE_PIXELFOURCC('N', 'V', '2', '1') + SDL_DEFINE_PIXELFOURCC('N', 'V', '2', '1'), + SDL_PIXELFORMAT_EXTERNAL_OES = /**< Android video texture format */ + SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ') }; typedef struct SDL_Color diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h index 9dde385f..7dea4ce9 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -121,7 +121,12 @@ #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) /* Try to find out if we're compiling for WinRT or non-WinRT */ #if defined(_MSC_VER) && defined(__has_include) -#define HAVE_WINAPIFAMILY_H __has_include() +#if __has_include() +#define HAVE_WINAPIFAMILY_H 1 +#else +#define HAVE_WINAPIFAMILY_H 0 +#endif + /* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */ #elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */ #define HAVE_WINAPIFAMILY_H 1 diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h index d48e8a37..a4fe8a93 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h index 9283c381..fea56a8d 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h index c4f6d74b..543bb618 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h index ea6ef9ff..d3361929 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -898,6 +898,27 @@ extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw */ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); +/** + * \brief Get the CAMetalLayer associated with the given Metal renderer + * + * \param renderer The renderer to query + * + * \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer + * + * \sa SDL_RenderGetMetalCommandEncoder() + */ +extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer); + +/** + * \brief Get the Metal command encoder for the current frame + * + * \param renderer The renderer to query + * + * \return id on success, or NULL if the renderer isn't a Metal renderer + * + * \sa SDL_RenderGetMetalLayer() + */ +extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h index 9376093e..dbe9b97d 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-11645:2088cd828335" -#define SDL_REVISION_NUMBER 11645 +#define SDL_REVISION "hg-11914:f1084c419f33" +#define SDL_REVISION_NUMBER 11914 diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h index 7f0cbdfd..0960699d 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h index 1d552120..63871aa3 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h index 9e492d93..40a6baaa 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h index 72402299..111a0645 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -501,18 +501,33 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size #endif extern DECLSPEC double SDLCALL SDL_acos(double x); +extern DECLSPEC float SDLCALL SDL_acosf(float x); extern DECLSPEC double SDLCALL SDL_asin(double x); +extern DECLSPEC float SDLCALL SDL_asinf(float x); extern DECLSPEC double SDLCALL SDL_atan(double x); +extern DECLSPEC float SDLCALL SDL_atanf(float x); extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); +extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y); extern DECLSPEC double SDLCALL SDL_ceil(double x); +extern DECLSPEC float SDLCALL SDL_ceilf(float x); extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); +extern DECLSPEC float SDLCALL SDL_copysignf(float x, float y); extern DECLSPEC double SDLCALL SDL_cos(double x); extern DECLSPEC float SDLCALL SDL_cosf(float x); extern DECLSPEC double SDLCALL SDL_fabs(double x); +extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); +extern DECLSPEC float SDLCALL SDL_floorf(float x); +extern DECLSPEC double SDLCALL SDL_fmod(double x, double y); +extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y); extern DECLSPEC double SDLCALL SDL_log(double x); +extern DECLSPEC float SDLCALL SDL_logf(float x); +extern DECLSPEC double SDLCALL SDL_log10(double x); +extern DECLSPEC float SDLCALL SDL_log10f(float x); extern DECLSPEC double SDLCALL SDL_pow(double x, double y); +extern DECLSPEC float SDLCALL SDL_powf(float x, float y); extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); +extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n); extern DECLSPEC double SDLCALL SDL_sin(double x); extern DECLSPEC float SDLCALL SDL_sinf(float x); extern DECLSPEC double SDLCALL SDL_sqrt(double x); diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h index 510690c9..45e5366f 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -97,6 +97,17 @@ typedef struct SDL_Surface typedef int (SDLCALL *SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, struct SDL_Surface * dst, SDL_Rect * dstrect); +/** + * \brief The formula used for converting between YUV and RGB + */ +typedef enum +{ + SDL_YUV_CONVERSION_JPEG, /**< Full range JPEG */ + SDL_YUV_CONVERSION_BT601, /**< BT.601 (the default) */ + SDL_YUV_CONVERSION_BT709, /**< BT.709 */ + SDL_YUV_CONVERSION_AUTOMATIC /**< BT.601 for SD content, BT.709 for HD content */ +} SDL_YUV_CONVERSION_MODE; + /** * Allocate and free an RGB surface. * @@ -509,6 +520,20 @@ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); +/** + * \brief Set the YUV conversion mode + */ +extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode); + +/** + * \brief Get the YUV conversion mode + */ +extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void); + +/** + * \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + */ +extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h index eb069b33..7b776fdf 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -108,6 +108,11 @@ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void); */ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); +/** + \brief Return true if the application is running on Android TV + */ +extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); + /** See the official Android developer guide for more information: http://developer.android.com/guide/topics/data/data-storage.html @@ -169,6 +174,25 @@ typedef enum } SDL_WinRT_Path; +/** + * \brief WinRT Device Family + */ +typedef enum +{ + /** \brief Unknown family */ + SDL_WINRT_DEVICEFAMILY_UNKNOWN, + + /** \brief Desktop family*/ + SDL_WINRT_DEVICEFAMILY_DESKTOP, + + /** \brief Mobile family (for example smartphone) */ + SDL_WINRT_DEVICEFAMILY_MOBILE, + + /** \brief XBox family */ + SDL_WINRT_DEVICEFAMILY_XBOX, +} SDL_WinRT_DeviceFamily; + + /** * \brief Retrieves a WinRT defined path on the local file system * @@ -203,6 +227,13 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path */ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); +/** + * \brief Detects the device family of WinRT plattform on runtime + * + * \return Device family + */ +extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); + #endif /* __WINRT__ */ /* Ends C function definitions when using C++ */ diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h index 2d18afb6..8aa4a39e 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h index d0f6575c..82a43fc0 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h index 282625d3..5600618f 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h index db9e25eb..f4075e79 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h index 06ee80cb..4ac248c8 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h index 5b4c4024..584b48c7 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 7 +#define SDL_PATCHLEVEL 8 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h index 6f6cda8b..83f49faa 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -110,7 +110,9 @@ typedef enum SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */ SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ), SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ - SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000, /**< window should be created in high-DPI mode if supported */ + SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000, /**< window should be created in high-DPI mode if supported. + On macOS NSHighResolutionCapable must be set true in the + application's Info.plist for this to have any effect. */ SDL_WINDOW_MOUSE_CAPTURE = 0x00004000, /**< window has mouse captured (unrelated to INPUT_GRABBED) */ SDL_WINDOW_ALWAYS_ON_TOP = 0x00008000, /**< window should always be above others */ SDL_WINDOW_SKIP_TASKBAR = 0x00010000, /**< window should not be added to the taskbar */ @@ -470,7 +472,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * If the window is created with any of the SDL_WINDOW_OPENGL or * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the - * corrensponding UnloadLibrary function is called by SDL_DestroyWindow(). + * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). * * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h index 803b5fee..f04c21ad 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h @@ -69,30 +69,43 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \brief Dynamically load a Vulkan loader library. * * \param [in] path The platform dependent Vulkan loader library name, or - * \c NULL to open the default Vulkan loader library. + * \c NULL. * * \return \c 0 on success, or \c -1 if the library couldn't be loaded. * - * This should be done after initializing the video driver, but before + * If \a path is NULL SDL will use the value of the environment variable + * \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan + * loader library. + * + * This should be called after initializing the video driver, but before * creating any Vulkan windows. If no Vulkan loader library is loaded, the * default library will be loaded upon creation of the first Vulkan window. * - * \note If you specify a non-NULL \a path, you should retrieve all of the - * Vulkan functions used in your program from the dynamic library using + * \note It is fairly common for Vulkan applications to link with \a libvulkan + * instead of explicitly loading it at run time. This will work with + * SDL provided the application links to a dynamic library and both it + * and SDL use the same search path. + * + * \note If you specify a non-NULL \c path, an application should retrieve all + * of the Vulkan functions it uses from the dynamic library using * \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee - * \a path points to the same vulkan loader library that you linked to. + * \c path points to the same vulkan loader library the application + * linked to. * * \note On Apple devices, if \a path is NULL, SDL will attempt to find * the vkGetInstanceProcAddr address within all the mach-o images of - * the current process. This is because the currently (v0.17.0) - * recommended MoltenVK (Vulkan on Metal) usage is as a static library. - * If it is not found then SDL will attempt to load \c libMoltenVK.dylib. - * Applications using the dylib alternative therefore do not need to do - * anything special when calling SDL. + * the current process. This is because it is fairly common for Vulkan + * applications to link with libvulkan (and historically MoltenVK was + * provided as a static library). If it is not found then, on macOS, SDL + * will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib, + * \c MoltenVK.framework/MoltenVK and \c libMoltenVK.dylib in that order. + * On iOS SDL will attempt to load \c libMoltenVK.dylib. Applications + * using a dynamic framework or .dylib must ensure it is included in its + * application bundle. * - * \note On non-Apple devices, SDL requires you to either not link to the - * Vulkan loader or link to a dynamic library version. This limitation - * may be removed in a future version of SDL. + * \note On non-Apple devices, application linking with a static libvulkan is + * not supported. Either do not link to the Vulkan loader or link to a + * dynamic library version. * * \note This function will fail if there are no working Vulkan drivers * installed. @@ -240,6 +253,9 @@ extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface( * platform with high-DPI support (Apple calls this "Retina"), and not disabled * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. * + * \note On macOS high-DPI support must be enabled for an application by + * setting NSHighResolutionCapable to true in its Info.plist. + * * \sa SDL_GetWindowSize() * \sa SDL_CreateWindow() */ diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h index 5372d6f0..6c210624 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h index 2a352dbb..b3b70a4c 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/source/xcode/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist index 7d5af646..14fd0440 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 16G29 + 17C88 CFBundleDevelopmentRegion English CFBundleExecutable @@ -19,7 +19,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.7 + 2.0.8 CFBundleSignature SDLX CFBundleSupportedPlatforms @@ -27,20 +27,20 @@ MacOSX CFBundleVersion - 2.0.7 + 2.0.8 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9A235 + 9C40b DTPlatformVersion GM DTSDKBuild - 17A360 + 17C76 DTSDKName macosx10.13 DTXcode - 0900 + 0920 DTXcodeBuild - 9A235 + 9C40b diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/SDL2 b/source/xcode/Frameworks/SDL2.framework/Versions/A/SDL2 index 2d7fc18b..36a762e5 100755 Binary files a/source/xcode/Frameworks/SDL2.framework/Versions/A/SDL2 and b/source/xcode/Frameworks/SDL2.framework/Versions/A/SDL2 differ diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources b/source/xcode/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources index b626d870..02ad89ac 100644 --- a/source/xcode/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources +++ b/source/xcode/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Resources/Info.plist - Bz86YsPyxZtz6JXNXguaJ5+jA4Y= + dts8ape5zBg3+8u8BQ5kWqp9cC8= files2 @@ -15,330 +15,330 @@ hash - bCSp0ekY7GYwqbJP2Cxp1OUP6L4= + wiqwnVgtbgjGPAOFejxz8yw7geU= hash2 - qUIbKaDFk9OM8NRy5VIDTTHwX6+SHbYFjhEuujiiqjw= + LLwzMAHn2OsCr2SVR7M71KeQf+TiJpHk/KKojzQdRlI= Headers/SDL_assert.h hash - cgOY0Tb6qcZJEbeI4VvLAKjWbVU= + zWoE6/P7ZWAYr4J+EVgDAK+kot8= hash2 - +w6Ym1qySFa1B6RgKpp7gXctUyMxvwWqi87PkgOv+OY= + tuS18C7A11akqH9MWT0WWCb6q7kcF97Ui5OFwNtSF/k= Headers/SDL_atomic.h hash - XCA1o2Cubs6rfO5o8kv3n3ZxlU4= + /q15zvR2djPgTRkySENYqzisn64= hash2 - 1vINYAvzbWlWXzhtd2PlB3oKJ0sebpijzFoIN8jDsiI= + n9rGA8zXFxasUnN0ytgLLWmW2CDCtKBeGJZcfB+nfRc= Headers/SDL_audio.h hash - 4Ahrh1xoqUwV4RQJl4sKUkSGuJI= + 9uJv81fH9Op/f3sF7/GVuNYQNOc= hash2 - D6FpiCOLws6dzCOMr9/kN9gpfSTyIbKuZ9uHDsquV8Y= + KDokTSV3kZuHCQFFrRum3VoTP1QSW2xAghjceoIArXY= Headers/SDL_bits.h hash - d4Fz9/UkMPyKDfLatZlo6NgCVWM= + yp8Jj93ZE224v1+u++cOexlp9RY= hash2 - 03278W5Orh7YjzL1+j91evZgvjsjXXV1rJMjH+Hws2Y= + kQTBxFYnOjKSlti4H7pAYZWdkH0BpQ9Eq54E/r/nlVY= Headers/SDL_blendmode.h hash - PPM4VUxzcVzXlDLxvSZOvNX1VVw= + kgTnzOrp0kqeI8lzDgQyT/gCGiM= hash2 - n5CKglE5zd/apegJrcLJ0WWQElWI7YDP7BUiJerZTCU= + d/8B0iLh4aFeoaPEFqQ4C6x4ISlDJCKrybaKuHCJHL4= Headers/SDL_clipboard.h hash - I4SpIRltgfEQpLE1YXikbsosqRw= + qq1r82AS7fHG8G94+jvL41iKEyA= hash2 - sZCFNNmLy1NOFGyCI3PR9N5fOO4prXZPG7cqjw7Mpag= + +r0LOXHGRf2Q9+FkqRU6i++1zEzsE5sWXxxMGrsSyKk= Headers/SDL_config.h hash - sgKE5seQ45oq9y9DtQ/h1YjKMpM= + nJnfliCMDJUfOG8t4QYt5U9tFBY= hash2 - kYM+sHCvaG8AlH0kxU1weu6HQ6eSgasEl0RJZ2+oSpw= + qkVvxnI+XRMTIdbzQ9tV+ERRc75r/EzWu0qRTgt5K5c= Headers/SDL_config_macosx.h hash - DuowtYhAyXNt3MqlaZQPxDqYIYk= + D0LXp0FibaaLSE6877hbyqf2Jb8= hash2 - KoqtqTwbdFaSlp4dyZ4ohg/FEmq1Spjn7E9RH/i42CE= + pCQLXwJ6HaGZiG5vr9njJtgNcIV9p0mxcSJtYoj147A= Headers/SDL_copying.h hash - wAKhQwYd0nAfZFpWN7Hqi4bim/o= + 0DKOkPvRlLo00X7iE2fL4i8XBww= hash2 - wBVAxn93qeWKkZhovCvikjYVKglF9N5PUe56A53BNG8= + nHJ8cj/FeSfLoRm5gRiDk73eyYlKn7u1BfbqkB2ofLg= Headers/SDL_cpuinfo.h hash - F+PVkWmNKx9qG5pLGlAfwT5ZK/E= + 2wleDfJFmCBrEssrE9rcuaiqOLQ= hash2 - SIFC/5Ns4H2lbp5fGSsPH1suFbO+khfrDlXWaZICn+Y= + MEpF0mFQFLhuTV+5uSB++q8tT2z5heESxyP1HuzuKxc= Headers/SDL_endian.h hash - 2WL7EDM8uoLYw+6ulo2OLTwoOOc= + WmJrxu+b1MkjtE6ttCymwH4EVC0= hash2 - 9Iq/Dqz27JHVETDj/YjIXY95hcb3E1wuPvoCzxIEAuU= + 77hv0QIqlra/8gcQF81aAwP21/ZAANKiIaJRV1QK8mk= Headers/SDL_error.h hash - RWwVmrBABIUxbhcSJvHW5p3+ea4= + HMprigJ3u4PqQ7B+gD1UUbTSrJ8= hash2 - m1RM7hJph5/xgqG3Du9NpCMhOAKWISmt2seH4c7Cxt8= + errosoVYCD45UvQVzL4Lmfq4eCQg92a6xUZ062DGEL4= Headers/SDL_events.h hash - lQnwuZvEM2v2asa7S4Gcj4w9zco= + ptgRA0IBsCg5za/lwhTOPGNmekY= hash2 - uzWsoLibur8QMgqezPCspPkEQE+J/gR0rrAcPdt5a+4= + lwISPqzee6nV4HCHaMzZCVJJAtFZmoi8cYlJkY41wKA= Headers/SDL_filesystem.h hash - bTePmFRHQLln5keSBPmXm++CNaA= + 9rIKoCtsAONdgfT/4QKm3a56hV0= hash2 - SsbxBmvkqDOcsWuX6LiJcEQP9izIcaevcb6Yepyohlw= + l5nBvMglAIFEWf357KMyQ+E7cr4GqO9XNwevA04+VmQ= Headers/SDL_gamecontroller.h hash - 8//1Pf8uNG76chSjoAmmTMnSdWk= + sUaSBwOprX7A696W6u2oOtIne+Y= hash2 - Hj6yDq/XlKbp1gia11f0al7seWG+gk5ziByHFLgun9k= + VZDstHk/V+tZik3q3xnDCAG3AfA+BoHk9lB406mKtxU= Headers/SDL_gesture.h hash - VvHdbikB5HuNKkSZKeSLfDLMLKE= + d80fR6I92r+G26xckkQzTRj/tj4= hash2 - 5347GYdn7iWNIRIuaebC3nj8CQ5P4oo6KPqAtrLHnPg= + /5+tOQWQ9raopqBCExlH9ClAA/fVAfEBIrd/WlpaqIE= Headers/SDL_haptic.h hash - l6xNikmnWY9UPsnORlO5lfOuuH4= + 95rNclZzbsuV6pyeG8cbIETgS84= hash2 - N0u8goaN+zdbjAxUaV3g10r87ZlmWknXc14MJOUqfv0= + O4RUmC9HMqsjAf22Ru6z5j9HaYTsc7SxOnzOXPR3kz0= Headers/SDL_hints.h hash - K+g3BaT3wdYyrHjn1q5h4vZPcQI= + UjEgXfZiLUmQTh9G+Bkx8Y1Ov6k= hash2 - VrjYrF0Un6QJCOZsCw8DLpJDZoy7ezRVzgq1kpABHDw= + DqFPmBXNg9BovdIAlipnBKZo5mcQJCrLmhyIM/O+tvU= Headers/SDL_joystick.h hash - vDuAMGdmdMxeURRcKDNdREGOtpg= + 97SJSCx+xjRHUQ6ilndhP8TZ110= hash2 - 4x4LTuCLFiBmBuolQ6QuLkoZY5a3y2VOU0V8IZAmI94= + xYWL+BS5f9NGr7eeP+vL0kD5K6O99PXgOWLT2Bx2dRQ= Headers/SDL_keyboard.h hash - v9m1w8RJJ6ofNiIRAd1hdRpsNSE= + RsaE9DMLq9lFsYokvdaQ8nhIkfY= hash2 - RwCbWiO1bJwFl4VC5u1PoKLSkP/C/D1c4w/5Krwgc5A= + tpZGEHU3TKCozcYf4MA9gA5bXNPSxx9rqqBaPttgr+4= Headers/SDL_keycode.h hash - D0uIRLUR7okM/w05UCqHKzY02GU= + 9nIqgM67nCJUdjV3iiiviT8DFhk= hash2 - z/pF3zJ+KNflyvJkCM5FbhF+na7Cx2VaZFjoXDIXeqo= + SpMclG+epmPQibi3fNsQe1lBUxZPJOOu4DfQjpTZYgw= Headers/SDL_loadso.h hash - BrI+F0uuOJ7FSy2xAG9sN1G06GE= + m+OEcfHbykTuEo6P3/y/kuV1xjk= hash2 - kdk/2NsrdD/9HldCoH9amkuPtdZH+gARWQ5E2s0nRmk= + Yg3OrZpF17uC69TwprPyrpn3+su3YAaaA1hTNXAHxLw= Headers/SDL_log.h hash - JddyZj5ZBxUmwkDlOv/4JEhp5Cs= + HcUUwymYqVSfgz2LdtuUqZSwjUY= hash2 - rt456XpqwuAvhlXw8RGCfVFNI3fELldJOZXhlt0HzrQ= + j4F34jvgNTEcHQQoPbBBugi4RKQLhGM+x4ndXdtDc0E= Headers/SDL_main.h hash - my6QUpD6kCyikUkq3ibQU439YPQ= + 7I0GPDiLKlavuXuoepYsl2mS6CI= hash2 - ocjOsEYVshsYpicYBKQuEdwa3i5ZSEUQ7vCwcj5a/G8= + qwXROmpXppMPodetUGE0s/7HHmwfu3taLUeiiu+APk0= Headers/SDL_messagebox.h hash - lTiWSMB7o0stvM4ZZw2WrtPGYlM= + MEB/oCw7dyinbrBmQQqh46/uRVk= hash2 - MH0dgRiFhiHeuy7jnCIAPwi27DC9ju9HTg421tMzwLA= + DSuDS/nAzfEi2kO06DEpxRLj5V1++p2DYYA9Oou8ewQ= Headers/SDL_mouse.h hash - fgNSzg2R0DCXQu5apQg+jcljstA= + I2UksqoB5v6RX64Ddwea9dW0sO0= hash2 - E3s7YEQN15qI4DZkuaZbxV3Qa6B/cxbFNa3PrOtVHAs= + gFMH6bBzvJCff8F7FMWlP6o6TydFmiXEu0daWp166wk= Headers/SDL_mutex.h hash - JGK7jk1LZ8kJ5Hs5V2Funhe73jY= + H6Q1bWPDKu2RsALoLzTBzPTrPkk= hash2 - NAMxohT8vMb7x7XlKWjlmavrZiAqf3Z0LngiHQBw9GA= + WKU8g7bVD3KpQEgvXuUGrPcG5hgg+LwQBgzLQCeSVTg= Headers/SDL_name.h hash - wHBa+dBJWbAtyZhRHBKPD5skDHs= + doLASBj4oiSiP6MW9wQblnyPN1E= hash2 - romvYzT1e7IEm5Aq9mrH8peVIsxpU7c4iB7euIAYGkw= + M0b8pslMMsWZp1KDVUdqX7ml3DKUVcwiTcfwGbhopvA= Headers/SDL_opengl.h hash - 2ukdgqPKKd3c8tEkdxWsghMqRbQ= + ZN9vVzyxx542ZCZ4nmASJKJ7qFM= hash2 - 1lTiKYGIpjSQ3dOsdSCXnSo7ZHfeKQG1A9FBqEc5sL0= + dazK6AC8BOZXW9m9761qsuoqe3eJozPIbSc1YEY3UVE= Headers/SDL_opengl_glext.h @@ -356,22 +356,22 @@ hash - HzdlzGorEdjARvp1fVMgA4WWmnI= + aVEa5N2CHg93ZxdDuKfDtFnCbU8= hash2 - nJ9ktABbkfsynAVNBtad72m2ZtQICbNXX0btHrHKiHQ= + 3CmcA5B4ydtkVin3NvNmYVHfgnhJJAVYNVw1YKM0Mko= Headers/SDL_opengles2.h hash - P0m5PHmG3SfHEHI9RBX7dj6I/yM= + yQ5nSugeN94hMSNhsIOmlAstJhY= hash2 - mb0XMGqMRLFA4denDMWPhjyj2BgF0Ls8TiWRLYYy0mU= + 8H2lt37zXZs68UfBlqDGqSJTQ2+Slu7qywggJ2mIosI= Headers/SDL_opengles2_gl2.h @@ -422,264 +422,264 @@ hash - d276FLzkZextbKWwhdFg+DG2kO8= + q2Uas2PGwUNo30Wiqomvrb03mp4= hash2 - cfK1wZwlwEs8YsAHpIkowdK1m3hdHczBX5Z78mYu5uc= + fpczDM4z7VLJW6FMvRTygnypORPdk2q89S1kCbS2fpM= Headers/SDL_platform.h hash - SM7tpTxOem15EYZAvX4GLqhzoUs= + aM0ptLXVxYx4yXLsNYOssy/jx9Y= hash2 - 3LKfM51pSjyCYoCBRfUYqV0WtBVy0yO+izuARFDX5E4= + R6MDdJ2ZUd9FGKReGdJE6YyHwqczb99jK9/IDW59AmI= Headers/SDL_power.h hash - SfALIyKnWubMPYgDv3VZc8Jh4Qs= + NqkQCWzmodWGdUFUZmzR9B/TApc= hash2 - L4zWflSzPvguM5H+1HkFK/S4zw+lzY9FMTjXXitfGX8= + VkJkbp+5Wd4WYDemJiu8R/emdH4PZSNPweoPmzRkfxM= Headers/SDL_quit.h hash - zRhh5G+7EVuDDWS5r+gFXaJ+ZTY= + eOEJzybg3UBfe83rKNfky9XAVGM= hash2 - tbpzcC/P37GIEJGWq5H6NyGRuhyfs9vGa6Dl5QIjdOU= + mN/T7PjHVtVce+/m7tIWIH8p8lylLWPuJAkCsbEvjhg= Headers/SDL_rect.h hash - kvaVvO8d5V6rXi6tufcTQzQAHJQ= + B7oWq3VOxrWbVn0YV8xpvXG6dic= hash2 - hicllrdaj8AfrD3RNDYmHNWRzco0MM5PTY0OKbKbg/I= + dCsZcEfdmcr1RuOycWAtHnnQs5BWk8lw0Ubnv/aUwG4= Headers/SDL_render.h hash - UIhq5ciNbuc3LVgz0v4fIG8lZV0= + ATenWUmKg6AEbv2SbCy9JfT8jCw= hash2 - mDbH/szt/ApxOLPpWufJf8kwBSDWhIqAsTdUTF+vZUQ= + EYiKPX5wRIcWkCyROlT59wuiDupZ6yp0+YsDWOrhtnQ= Headers/SDL_revision.h hash - JiwcmPZwrc8sMFZCEFNsIoFStP4= + XBn2NI8Qm53MeZGaXVB3fQrs0uc= hash2 - D+julfUHNTNm0egebydA46uGliazWGhNqk+6oihpaFE= + FHG6Lqi1wMmjow+JjxKYy/LAoqP+iDH8QYuJS1zr6T4= Headers/SDL_rwops.h hash - oGBM2YLStsGU9lUIwXbt2lLEgVM= + ULSy/1QoNQhBu3kk75qXo30Wcvs= hash2 - Kr7trOYYfYP0owBj23DrqEmxAkrfSF/xsnKQapOWPhs= + KewlZ14FJ6CfLjd7EDc1KlVSiUhIt2P9d3p2VEJuUUA= Headers/SDL_scancode.h hash - +mxYpPZ5WhNo9ESh23Zk/QpNp70= + FAcbPIsuPOYbsldZL4m0AFUeoW4= hash2 - tDjymJB2lMvcSqdPEQhyjRv+axH1KMutOOP+jbU87aw= + 5VaZC9IfMuNgz3h6OJn9Q/IGB/+cpymxIrjkluCWzOo= Headers/SDL_shape.h hash - 8gBUOPTc1xkDwM3ttUxt7ywoGNM= + S5Ty+gKktVyifkoYT0K7E48JqdI= hash2 - MD9twjfZt8GLkbw5OZtzJEGrfxfsvRegyjH0rEyjswk= + LVwSnfZBuKL1bW2zy4rt0vRPmH2/ZxfmP0xB9pLVEOE= Headers/SDL_stdinc.h hash - 9In2yKPK9KcDc2qYC2dWGSwQe2M= + qBTB0Yqh+34vD3n3dN9ry9GwqJM= hash2 - rY36PbCJYSpEQjYPyQiQ/UaxbDkQh/oE0g3tHtQnx9o= + TDMriI0PPYF73lvh6suExzpMldCmX1SkLgg+wkBqt7A= Headers/SDL_surface.h hash - gr5EXI95jltsjK960gdgw0t4Hw0= + bssTKTIF4Yw/3a6fyF7GhaVrdU0= hash2 - jYNTWsL2/IYEUD/oq66xBszls/3rotwLJJbipIr328Y= + zRF/b8bCqjClZnbPorqjhlWw9aujM9RwnVemHyiC2yM= Headers/SDL_system.h hash - V2mVDr0sjN8lESM/O81RVowGRZI= + n2WodCV+WpbfpFSKUUKpB/i5ZPw= hash2 - MNzIyHwql3lSzSbu4jayb32/UlNw4n6Oh31ZaPQG6bI= + 3W0Z/Fdwbc7dTyR+v4g6eVE58XcEYLTzDGO+RMwcmJc= Headers/SDL_syswm.h hash - te7XcGoTYtebQ0CzQcK7hGYb8ts= + QoebSqgb1XslKPBwMiUOM6daVKo= hash2 - yVbaT841x6sELdVjU7K/Z8AeIhqLAWed6LXvFhNf3uw= + rCqmdvdibhT5MBOnvKCT0gK7Howb5uLewC321yLYr5U= Headers/SDL_thread.h hash - 5ZBMRbeze0GZ3wgSL+YBH2EJe2s= + fXCWQD4MIniqvdB6pWVwlxNS9jk= hash2 - uqhzYZnfCjHXNyYyFJlKGEUvHWTTm+OWSKbDOk24VZA= + 18iJ1yFzOTeiM30JwK3GMlbgUqzNDIQiw3ZLLr3M+XQ= Headers/SDL_timer.h hash - 1K5vhmq6ypoXBhgD+3ZQcIfz4jU= + qfzyWhIh36SK6BAcdd50D/MfdGo= hash2 - kKnb1udMNab/jNxya4ZEBY2zkIF6egyM5CiFGZfNioI= + 5Qe92nVkUnHbxgbGwxkyglvVKajhfgVhxPei6dhr4c0= Headers/SDL_touch.h hash - UUivcnQalXraNT5+mTWWJc1cMWo= + yyJt6piMAcoFWhFqsHk9mo3MtaI= hash2 - jWVTBn/jjuGgvFPGomnBKj0PXkdl/lmpn6qmCYCIiqY= + 9mQ2V937DAO6OjcQFMboFrnJEiqdk+2uHBzdvMYUnd0= Headers/SDL_types.h hash - ubK+IX/QmKJ2TZ5D3ygQD1BmEWQ= + oVg7CzABdDKtxCWINHaUvBRbRZ0= hash2 - H5cJeXjI5ET1fiF6Kzv70tLuId9s0b8ole3XJQxy6MA= + 8uZym5ly46CZ4VQZCz/Y/cH4THoDS8kGqrvB+Ux/254= Headers/SDL_version.h hash - LJN1tLNZeNGq6cOQo20Kh3AHL8A= + nKLee2vSNZZK9p94Up9o87OoiDE= hash2 - 6XCO1GhNFyWU1aS238Y3NzboAgDQCGUO+tRKaCvtIkc= + F3dpo9XlvebIS2NLJ1ovH+W7fG3bzb01F8OKUeqd+U0= Headers/SDL_video.h hash - SAeUU45kbgynjqyHABv/kG9j9jE= + UFZPU1U3CDog3RBKdd5wu9LFQZk= hash2 - LqiK/cgptVjhXJtB8zkXsMi+kAjsr6zr+mgGINou7wU= + 6/OCq92BIQnGHBLmlGX4nUNnfLM7LzPoMp+lPlYY4ew= Headers/SDL_vulkan.h hash - d4mI8EfWZ4ITzvLIEl3RM0mdOZI= + eLdIezOR2pV1ai5rLBrtiR3NAok= hash2 - hyQVx5v7eXQ5H92Hh66ifaBLXWUajxkG+s33o5z0k+Q= + iCB8avj2P0+ZkjVGfTchu5BAd7BJ+LeC1fJ9BU+80IE= Headers/begin_code.h hash - WAe13VUeut8tQQwfKLOW7f1M4xI= + 6RX1yuMtg6N9G2iCtCjjKzPCkuU= hash2 - c9N0XgDh8nZwtQeok2q6zqwL35RtY21I3faVlN3FGfQ= + JQ71zTwAp3EzI22aBP3w80YYEcxNBRF8/0DkqO39oDo= Headers/close_code.h hash - W22Tn2TBag4M5qudrzDDNcp8LI8= + IDKa63p9RAIkSpPXA0mU/dzgBWQ= hash2 - 7GpPEq3SBfw8N9TPaqYhao7iDJNLghXXIIhcKxyLOCo= + oF0I0dcQDvLcuEIgqx9wEQiuqHR5KLoq1zhL/AK5geg= Resources/Info.plist hash - Bz86YsPyxZtz6JXNXguaJ5+jA4Y= + dts8ape5zBg3+8u8BQ5kWqp9cC8= hash2 - 3VI647gf464YDVl5wdSH3Uwt7gze1hMFZRwBYkYu3IM= + ZCgx1szeVwObsPiq6VoZh8Q9ym7l+7WXzv0HTSoFT0U= diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/Current b/source/xcode/Frameworks/SDL2.framework/Versions/Current deleted file mode 100644 index 8c7e5a66..00000000 --- a/source/xcode/Frameworks/SDL2.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/source/xcode/Frameworks/SDL2.framework/Versions/Current b/source/xcode/Frameworks/SDL2.framework/Versions/Current new file mode 120000 index 00000000..8c7e5a66 --- /dev/null +++ b/source/xcode/Frameworks/SDL2.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file