From ca04f1182df079b4e319506ed658972a19af14ee Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 17 Dec 2020 12:04:44 +0200 Subject: [PATCH] update sdl2 config header --- deps/sdl2/include/SDL2/SDL_config.h | 150 ++++++++++++++++++++-------- 1 file changed, 106 insertions(+), 44 deletions(-) diff --git a/deps/sdl2/include/SDL2/SDL_config.h b/deps/sdl2/include/SDL2/SDL_config.h index 99269bde..15c61b61 100644 --- a/deps/sdl2/include/SDL2/SDL_config.h +++ b/deps/sdl2/include/SDL2/SDL_config.h @@ -1,4 +1,3 @@ -/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer Copyright (C) 1997-2020 Sam Lantinga @@ -32,22 +31,19 @@ /* General platform specific identifiers */ #include "SDL_platform.h" -/* Make sure that this isn't included by Visual C++ */ -#ifdef _MSC_VER -#error You should run hg revert SDL_config.h -#endif - /* C language features */ /* #undef const */ /* #undef inline */ /* #undef volatile */ /* C datatypes */ +/* Define SIZEOF_VOIDP for 64/32 architectures */ #ifdef __LP64__ #define SIZEOF_VOIDP 8 #else #define SIZEOF_VOIDP 4 #endif + #define HAVE_GCC_ATOMICS 1 /* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */ @@ -59,7 +55,7 @@ #define STDC_HEADERS 1 #define HAVE_ALLOCA_H 1 #define HAVE_CTYPE_H 1 -#define HAVE_FLOAT_H 1 +/* #undef HAVE_FLOAT_H */ #define HAVE_ICONV_H 1 #define HAVE_INTTYPES_H 1 #define HAVE_LIMITS_H 1 @@ -136,11 +132,10 @@ #define HAVE_STRCASECMP 1 /* #undef HAVE__STRNICMP */ #define HAVE_STRNCASECMP 1 -/* #undef HAVE_SSCANF */ +#define HAVE_SSCANF 1 #define HAVE_VSSCANF 1 -/* #undef HAVE_SNPRINTF */ #define HAVE_VSNPRINTF 1 -#define HAVE_M_PI /**/ +#define HAVE_M_PI 1 #define HAVE_ACOS 1 #define HAVE_ACOSF 1 #define HAVE_ASIN 1 @@ -189,7 +184,7 @@ /* #undef HAVE_CLOCK_GETTIME */ /* #undef HAVE_GETPAGESIZE */ #define HAVE_MPROTECT 1 -#define HAVE_ICONV 1 +/* #undef HAVE_ICONV */ #define HAVE_PTHREAD_SETNAME_NP 1 /* #undef HAVE_PTHREAD_SET_NAME_NP */ /* #undef HAVE_SEM_TIMEDWAIT */ @@ -197,10 +192,13 @@ #define HAVE_POLL 1 #define HAVE__EXIT 1 -#else +#elif __WIN32__ #define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 -#define HAVE_STDINT_H 1 +/* #undef HAVE_FLOAT_H */ +#else +/* We may need some replacement for stdarg.h here */ +#include #endif /* HAVE_LIBC */ /* #undef HAVE_ALTIVEC_H */ @@ -211,13 +209,17 @@ /* #undef HAVE_LIBSAMPLERATE_H */ /* #undef HAVE_LIBUDEV_H */ +/* #undef HAVE_D3D_H */ +/* #undef HAVE_D3D11_H */ /* #undef HAVE_DDRAW_H */ -/* #undef HAVE_DINPUT_H */ /* #undef HAVE_DSOUND_H */ -/* #undef HAVE_DXGI_H */ +/* #undef HAVE_DINPUT_H */ /* #undef HAVE_XINPUT_H */ +/* #undef HAVE_DXGI_H */ + /* #undef HAVE_MMDEVICEAPI_H */ /* #undef HAVE_AUDIOCLIENT_H */ + /* #undef HAVE_XINPUT_GAMEPAD_EX */ /* #undef HAVE_XINPUT_STATE_EX */ @@ -259,7 +261,6 @@ /* #undef SDL_AUDIO_DRIVER_HAIKU */ /* #undef SDL_AUDIO_DRIVER_JACK */ /* #undef SDL_AUDIO_DRIVER_JACK_DYNAMIC */ -/* #undef SDL_AUDIO_DRIVER_NACL */ /* #undef SDL_AUDIO_DRIVER_NAS */ /* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ /* #undef SDL_AUDIO_DRIVER_NETBSD */ @@ -279,27 +280,30 @@ /* #undef SDL_INPUT_LINUXEV */ /* #undef SDL_INPUT_LINUXKD */ /* #undef SDL_INPUT_TSLIB */ +/* #undef SDL_JOYSTICK_ANDROID */ /* #undef SDL_JOYSTICK_HAIKU */ /* #undef SDL_JOYSTICK_DINPUT */ /* #undef SDL_JOYSTICK_XINPUT */ /* #undef SDL_JOYSTICK_DUMMY */ #define SDL_JOYSTICK_IOKIT 1 +/* #undef SDL_JOYSTICK_MFI */ /* #undef SDL_JOYSTICK_LINUX */ -/* #undef SDL_JOYSTICK_ANDROID */ /* #undef SDL_JOYSTICK_WINMM */ /* #undef SDL_JOYSTICK_USBHID */ /* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */ /* #undef SDL_JOYSTICK_HIDAPI */ /* #undef SDL_JOYSTICK_EMSCRIPTEN */ /* #undef SDL_HAPTIC_DUMMY */ -/* #undef SDL_HAPTIC_ANDROID */ /* #undef SDL_HAPTIC_LINUX */ #define SDL_HAPTIC_IOKIT 1 /* #undef SDL_HAPTIC_DINPUT */ /* #undef SDL_HAPTIC_XINPUT */ +/* #undef SDL_HAPTIC_ANDROID */ +/* #undef SDL_LIBUSB_DYNAMIC */ /* Enable various sensor drivers */ /* #undef SDL_SENSOR_ANDROID */ +/* #undef SDL_SENSOR_COREMOTION */ #define SDL_SENSOR_DUMMY 1 /* Enable various shared object loading systems */ @@ -319,27 +323,35 @@ /* #undef SDL_TIMER_DUMMY */ #define SDL_TIMER_UNIX 1 /* #undef SDL_TIMER_WINDOWS */ +/* #undef SDL_TIMER_WINCE */ /* Enable various video drivers */ +/* #undef SDL_VIDEO_DRIVER_ANDROID */ /* #undef SDL_VIDEO_DRIVER_HAIKU */ #define SDL_VIDEO_DRIVER_COCOA 1 +/* #undef SDL_VIDEO_DRIVER_UIKIT */ /* #undef SDL_VIDEO_DRIVER_DIRECTFB */ /* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */ #define SDL_VIDEO_DRIVER_DUMMY 1 +/* #undef SDL_VIDEO_DRIVER_OFFSCREEN */ /* #undef SDL_VIDEO_DRIVER_WINDOWS */ /* #undef SDL_VIDEO_DRIVER_WAYLAND */ +/* #undef SDL_VIDEO_DRIVER_RPI */ +/* #undef SDL_VIDEO_DRIVER_VIVANTE */ +/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */ + +/* #undef SDL_VIDEO_DRIVER_KMSDRM */ +/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC */ +/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM */ + /* #undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */ /* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ /* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL */ /* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR */ /* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON */ -/* #undef SDL_VIDEO_DRIVER_X11 */ -/* #undef SDL_VIDEO_DRIVER_RPI */ -/* #undef SDL_VIDEO_DRIVER_KMSDRM */ -/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC */ -/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM */ -/* #undef SDL_VIDEO_DRIVER_ANDROID */ + /* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */ +/* #undef SDL_VIDEO_DRIVER_X11 */ /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC */ /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT */ /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR */ @@ -360,10 +372,6 @@ /* #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS */ /* #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY */ /* #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM */ -/* #undef SDL_VIDEO_DRIVER_NACL */ -/* #undef SDL_VIDEO_DRIVER_VIVANTE */ -/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */ -/* #undef SDL_VIDEO_DRIVER_QNX */ /* #undef SDL_VIDEO_RENDER_D3D */ /* #undef SDL_VIDEO_RENDER_D3D11 */ @@ -371,7 +379,7 @@ /* #undef SDL_VIDEO_RENDER_OGL_ES */ #define SDL_VIDEO_RENDER_OGL_ES2 1 /* #undef SDL_VIDEO_RENDER_DIRECTFB */ -#define SDL_VIDEO_RENDER_METAL 1 +/* #undef SDL_VIDEO_RENDER_METAL */ /* Enable OpenGL support */ #define SDL_VIDEO_OPENGL 1 @@ -379,35 +387,35 @@ #define SDL_VIDEO_OPENGL_ES2 1 /* #undef SDL_VIDEO_OPENGL_BGL */ #define SDL_VIDEO_OPENGL_CGL 1 -#define SDL_VIDEO_OPENGL_EGL 1 /* #undef SDL_VIDEO_OPENGL_GLX */ /* #undef SDL_VIDEO_OPENGL_WGL */ +#define SDL_VIDEO_OPENGL_EGL 1 /* #undef SDL_VIDEO_OPENGL_OSMESA */ /* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ /* Enable Vulkan support */ -#define SDL_VIDEO_VULKAN 1 +/* #undef SDL_VIDEO_VULKAN */ /* Enable Metal support */ -#define SDL_VIDEO_METAL 1 +/* #undef SDL_VIDEO_METAL */ /* Enable system power support */ +/* #undef SDL_POWER_ANDROID */ /* #undef SDL_POWER_LINUX */ /* #undef SDL_POWER_WINDOWS */ #define SDL_POWER_MACOSX 1 +/* #undef SDL_POWER_UIKIT */ /* #undef SDL_POWER_HAIKU */ -/* #undef SDL_POWER_ANDROID */ /* #undef SDL_POWER_EMSCRIPTEN */ /* #undef SDL_POWER_HARDWIRED */ /* Enable system filesystem support */ +/* #undef SDL_FILESYSTEM_ANDROID */ /* #undef SDL_FILESYSTEM_HAIKU */ #define SDL_FILESYSTEM_COCOA 1 /* #undef SDL_FILESYSTEM_DUMMY */ /* #undef SDL_FILESYSTEM_UNIX */ /* #undef SDL_FILESYSTEM_WINDOWS */ -/* #undef SDL_FILESYSTEM_NACL */ -/* #undef SDL_FILESYSTEM_ANDROID */ /* #undef SDL_FILESYSTEM_EMSCRIPTEN */ /* Enable assembly routines */ @@ -416,16 +424,70 @@ /* #undef SDL_ARM_SIMD_BLITTERS */ /* #undef SDL_ARM_NEON_BLITTERS */ -/* Enable ime support */ -/* #undef SDL_USE_IME */ - -/* Enable dynamic udev support */ -/* #undef SDL_UDEV_DYNAMIC */ - -/* Enable dynamic libusb support */ -/* #undef SDL_LIBUSB_DYNAMIC */ - /* Enable dynamic libsamplerate support */ /* #undef SDL_LIBSAMPLERATE_DYNAMIC */ +/* Platform specific definitions */ +/* #undef SDL_IPHONE_KEYBOARD */ +/* #undef SDL_IPHONE_LAUNCHSCREEN */ + +#if !defined(__WIN32__) +# if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H) +typedef unsigned int size_t; +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; +typedef unsigned long uintptr_t; +# endif /* if (stdint.h isn't available) */ +#else /* __WIN32__ */ +# if !defined(_STDINT_H_) && !defined(HAVE_STDINT_H) && !defined(_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; +# 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 */ +#endif /* __WIN32__ */ + #endif /* SDL_config_h_ */