| Index: third_party/libsdl/mac/SDL_config.h
|
| diff --git a/third_party/libsdl/linux/SDL_config.h b/third_party/libsdl/mac/SDL_config.h
|
| similarity index 85%
|
| copy from third_party/libsdl/linux/SDL_config.h
|
| copy to third_party/libsdl/mac/SDL_config.h
|
| index 8cfc394a534da4b950d45d47315eb9c6da1ae032..ea06bc1e3c98409c0fb93d31d10b7dce7d5850c5 100644
|
| --- a/third_party/libsdl/linux/SDL_config.h
|
| +++ b/third_party/libsdl/mac/SDL_config.h
|
| @@ -68,7 +68,7 @@
|
| #define STDC_HEADERS 1
|
| #define HAVE_STDLIB_H 1
|
| #define HAVE_STDARG_H 1
|
| -#define HAVE_MALLOC_H 1
|
| +/* #undef HAVE_MALLOC_H */
|
| #define HAVE_MEMORY_H 1
|
| #define HAVE_STRING_H 1
|
| #define HAVE_STRINGS_H 1
|
| @@ -104,8 +104,8 @@
|
| #define HAVE_MEMMOVE 1
|
| #define HAVE_MEMCMP 1
|
| #define HAVE_STRLEN 1
|
| -/* #undef HAVE_STRLCPY */
|
| -/* #undef HAVE_STRLCAT */
|
| +#define HAVE_STRLCPY 1
|
| +#define HAVE_STRLCAT 1
|
| #define HAVE_STRDUP 1
|
| /* #undef HAVE__STRREV */
|
| /* #undef HAVE__STRUPR */
|
| @@ -159,20 +159,20 @@
|
| #define HAVE_TAN 1
|
| #define HAVE_TANF 1
|
| #define HAVE_FSEEKO 1
|
| -#define HAVE_FSEEKO64 1
|
| +/* #undef HAVE_FSEEKO64 */
|
| #define HAVE_SIGACTION 1
|
| #define HAVE_SA_SIGACTION 1
|
| #define HAVE_SETJMP 1
|
| #define HAVE_NANOSLEEP 1
|
| #define HAVE_SYSCONF 1
|
| -/* #undef HAVE_SYSCTLBYNAME */
|
| -#define HAVE_CLOCK_GETTIME 1
|
| +#define HAVE_SYSCTLBYNAME 1
|
| +/* #undef HAVE_CLOCK_GETTIME */
|
| /* #undef HAVE_GETPAGESIZE */
|
| #define HAVE_MPROTECT 1
|
| #define HAVE_ICONV 1
|
| #define HAVE_PTHREAD_SETNAME_NP 1
|
| /* #undef HAVE_PTHREAD_SET_NAME_NP */
|
| -#define HAVE_SEM_TIMEDWAIT 1
|
| +/* #undef HAVE_SEM_TIMEDWAIT */
|
|
|
| #else
|
| #define HAVE_STDARG_H 1
|
| @@ -232,8 +232,8 @@
|
| /* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */
|
|
|
| /* Enable various input drivers */
|
| -#define SDL_INPUT_LINUXEV 1
|
| -#define SDL_INPUT_LINUXKD 1
|
| +/* #undef SDL_INPUT_LINUXEV */
|
| +/* #undef SDL_INPUT_LINUXKD */
|
| /* #undef SDL_INPUT_TSLIB */
|
| /* #undef SDL_JOYSTICK_HAIKU */
|
| /* #undef SDL_JOYSTICK_DINPUT */
|
| @@ -273,7 +273,7 @@
|
|
|
| /* Enable various video drivers */
|
| /* #undef SDL_VIDEO_DRIVER_HAIKU */
|
| -/* #undef SDL_VIDEO_DRIVER_COCOA */
|
| +#define SDL_VIDEO_DRIVER_COCOA 1
|
| /* #undef SDL_VIDEO_DRIVER_DIRECTFB */
|
| /* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
|
| /* #undef SDL_VIDEO_DRIVER_DUMMY */
|
| @@ -287,30 +287,30 @@
|
| /* #undef SDL_VIDEO_DRIVER_MIR */
|
| /* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC */
|
| /* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
|
| -#define SDL_VIDEO_DRIVER_X11 1
|
| +/* #undef SDL_VIDEO_DRIVER_X11 */
|
| /* #undef SDL_VIDEO_DRIVER_RPI */
|
| /* #undef SDL_VIDEO_DRIVER_ANDROID */
|
| /* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "libXcursor.so.1"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "libXinerama.so.1"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "libXss.so.1"
|
| -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "libXxf86vm.so.1"
|
| -#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
|
| -#define SDL_VIDEO_DRIVER_X11_XDBE 1
|
| -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
|
| -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
|
| -#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 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_SUPPORTS_GENERIC_EVENTS 1
|
| -#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
|
| -#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XCURSOR */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XDBE */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XINERAMA */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XINPUT2 */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XSHAPE */
|
| +/* #undef SDL_VIDEO_DRIVER_X11_XVIDMODE */
|
| +/* #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 */
|
| @@ -319,17 +319,17 @@
|
| /* #undef SDL_VIDEO_RENDER_D3D11 */
|
| #define SDL_VIDEO_RENDER_OGL 1
|
| /* #undef SDL_VIDEO_RENDER_OGL_ES */
|
| -#define SDL_VIDEO_RENDER_OGL_ES2 1
|
| +/* #undef SDL_VIDEO_RENDER_OGL_ES2 */
|
| /* #undef SDL_VIDEO_RENDER_DIRECTFB */
|
|
|
| /* Enable OpenGL support */
|
| #define SDL_VIDEO_OPENGL 1
|
| /* #undef SDL_VIDEO_OPENGL_ES */
|
| -#define SDL_VIDEO_OPENGL_ES2 1
|
| +/* #undef SDL_VIDEO_OPENGL_ES2 */
|
| /* #undef SDL_VIDEO_OPENGL_BGL */
|
| -/* #undef SDL_VIDEO_OPENGL_CGL */
|
| -#define SDL_VIDEO_OPENGL_EGL 1
|
| -#define SDL_VIDEO_OPENGL_GLX 1
|
| +#define SDL_VIDEO_OPENGL_CGL 1
|
| +/* #undef SDL_VIDEO_OPENGL_EGL */
|
| +/* #undef SDL_VIDEO_OPENGL_GLX */
|
| /* #undef SDL_VIDEO_OPENGL_WGL */
|
| /* #undef SDL_VIDEO_OPENGL_OSMESA */
|
| /* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
|
| @@ -345,9 +345,9 @@
|
|
|
| /* Enable system filesystem support */
|
| /* #undef SDL_FILESYSTEM_HAIKU */
|
| -/* #undef SDL_FILESYSTEM_COCOA */
|
| +#define SDL_FILESYSTEM_COCOA 1
|
| /* #undef SDL_FILESYSTEM_DUMMY */
|
| -#define SDL_FILESYSTEM_UNIX 1
|
| +/* #undef SDL_FILESYSTEM_UNIX */
|
| /* #undef SDL_FILESYSTEM_WINDOWS */
|
| /* #undef SDL_FILESYSTEM_NACL */
|
| /* #undef SDL_FILESYSTEM_ANDROID */
|
|
|