Index: third_party/libsdl/linux/SDL_config.h |
diff --git a/third_party/libsdl/linux/SDL_config.h b/third_party/libsdl/linux/SDL_config.h |
index 34ff05bd94313012255a6ef79fd27543233cddab..8cfc394a534da4b950d45d47315eb9c6da1ae032 100644 |
--- a/third_party/libsdl/linux/SDL_config.h |
+++ b/third_party/libsdl/linux/SDL_config.h |
@@ -1,7 +1,7 @@ |
/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ |
/* |
Simple DirectMedia Layer |
- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org> |
+ Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org> |
This software is provided 'as-is', without any express or implied |
warranty. In no event will the authors be held liable for any damages |
@@ -50,7 +50,12 @@ |
#endif |
#define HAVE_GCC_ATOMICS 1 |
/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */ |
-#define HAVE_PTHREAD_SPINLOCK 1 |
+ |
+/* #undef HAVE_DDRAW_H */ |
+/* #undef HAVE_DINPUT_H */ |
+/* #undef HAVE_DSOUND_H */ |
+/* #undef HAVE_DXGI_H */ |
+/* #undef HAVE_XINPUT_H */ |
/* Comment this if you want to build without any C library requirements */ |
#define HAVE_LIBC 1 |
@@ -75,9 +80,9 @@ |
#define HAVE_SIGNAL_H 1 |
/* #undef HAVE_ALTIVEC_H */ |
/* #undef HAVE_PTHREAD_NP_H */ |
-// TODO we currently disable this, is this okay? |
-//#define HAVE_LIBUDEV_H 1 |
-//#define HAVE_DBUS_DBUS_H 1 |
+/* #undef HAVE_LIBUDEV_H */ |
+/* #undef HAVE_DBUS_DBUS_H */ |
+/* #undef HAVE_IBUS_IBUS_H */ |
/* C library functions */ |
#define HAVE_MALLOC 1 |
@@ -136,7 +141,6 @@ |
#define HAVE_M_PI /**/ |
#define HAVE_ATAN 1 |
#define HAVE_ATAN2 1 |
-#define HAVE_TAN 1 |
#define HAVE_ACOS 1 |
#define HAVE_ASIN 1 |
#define HAVE_CEIL 1 |
@@ -151,6 +155,9 @@ |
#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_FSEEKO 1 |
#define HAVE_FSEEKO64 1 |
#define HAVE_SIGACTION 1 |
@@ -182,14 +189,14 @@ |
/* #undef SDL_CPUINFO_DISABLED */ |
/* #undef SDL_EVENTS_DISABLED */ |
/* #undef SDL_FILE_DISABLED */ |
-/* #undef SDL_JOYSTICK_DISABLED */ |
-/* #undef SDL_HAPTIC_DISABLED */ |
+#define SDL_JOYSTICK_DISABLED 1 |
+#define SDL_HAPTIC_DISABLED 1 |
/* #undef SDL_LOADSO_DISABLED */ |
/* #undef SDL_RENDER_DISABLED */ |
/* #undef SDL_THREADS_DISABLED */ |
/* #undef SDL_TIMERS_DISABLED */ |
/* #undef SDL_VIDEO_DISABLED */ |
-/* #undef SDL_POWER_DISABLED */ |
+#define SDL_POWER_DISABLED 1 |
/* #undef SDL_FILESYSTEM_DISABLED */ |
/* Enable various audio drivers */ |
@@ -204,10 +211,12 @@ |
/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ |
/* #undef SDL_AUDIO_DRIVER_DISK */ |
/* #undef SDL_AUDIO_DRIVER_DUMMY */ |
+/* #undef SDL_AUDIO_DRIVER_ANDROID */ |
/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */ |
/* #undef SDL_AUDIO_DRIVER_DSOUND */ |
/* #undef SDL_AUDIO_DRIVER_ESD */ |
/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ |
+/* #undef SDL_AUDIO_DRIVER_NACL */ |
/* #undef SDL_AUDIO_DRIVER_NAS */ |
/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ |
/* #undef SDL_AUDIO_DRIVER_SNDIO */ |
@@ -220,6 +229,7 @@ |
/* #undef SDL_AUDIO_DRIVER_WINMM */ |
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */ |
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */ |
+/* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */ |
/* Enable various input drivers */ |
#define SDL_INPUT_LINUXEV 1 |
@@ -227,16 +237,20 @@ |
/* #undef SDL_INPUT_TSLIB */ |
/* #undef SDL_JOYSTICK_HAIKU */ |
/* #undef SDL_JOYSTICK_DINPUT */ |
+/* #undef SDL_JOYSTICK_XINPUT */ |
/* #undef SDL_JOYSTICK_DUMMY */ |
/* #undef SDL_JOYSTICK_IOKIT */ |
-#define SDL_JOYSTICK_LINUX 1 |
+/* #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_EMSCRIPTEN */ |
/* #undef SDL_HAPTIC_DUMMY */ |
-#define SDL_HAPTIC_LINUX 1 |
+/* #undef SDL_HAPTIC_LINUX */ |
/* #undef SDL_HAPTIC_IOKIT */ |
/* #undef SDL_HAPTIC_DINPUT */ |
+/* #undef SDL_HAPTIC_XINPUT */ |
/* Enable various shared object loading systems */ |
/* #undef SDL_LOADSO_HAIKU */ |
@@ -262,7 +276,7 @@ |
/* #undef SDL_VIDEO_DRIVER_COCOA */ |
/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ |
/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */ |
-#define SDL_VIDEO_DRIVER_DUMMY 1 |
+/* #undef SDL_VIDEO_DRIVER_DUMMY */ |
/* #undef SDL_VIDEO_DRIVER_WINDOWS */ |
/* #undef SDL_VIDEO_DRIVER_WAYLAND */ |
/* #undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */ |
@@ -275,6 +289,8 @@ |
/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */ |
#define SDL_VIDEO_DRIVER_X11 1 |
/* #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" |
@@ -284,6 +300,7 @@ |
#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 |
@@ -292,9 +309,11 @@ |
#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_XDATA32 1 |
#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1 |
#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 |
+/* #undef SDL_VIDEO_DRIVER_NACL */ |
+/* #undef SDL_VIDEO_DRIVER_VIVANTE */ |
+/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */ |
/* #undef SDL_VIDEO_RENDER_D3D */ |
/* #undef SDL_VIDEO_RENDER_D3D11 */ |
@@ -316,10 +335,12 @@ |
/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ |
/* Enable system power support */ |
-#define SDL_POWER_LINUX 1 |
+/* #undef SDL_POWER_LINUX */ |
/* #undef SDL_POWER_WINDOWS */ |
/* #undef SDL_POWER_MACOSX */ |
/* #undef SDL_POWER_HAIKU */ |
+/* #undef SDL_POWER_ANDROID */ |
+/* #undef SDL_POWER_EMSCRIPTEN */ |
/* #undef SDL_POWER_HARDWIRED */ |
/* Enable system filesystem support */ |
@@ -328,6 +349,9 @@ |
/* #undef SDL_FILESYSTEM_DUMMY */ |
#define SDL_FILESYSTEM_UNIX 1 |
/* #undef SDL_FILESYSTEM_WINDOWS */ |
+/* #undef SDL_FILESYSTEM_NACL */ |
+/* #undef SDL_FILESYSTEM_ANDROID */ |
+/* #undef SDL_FILESYSTEM_EMSCRIPTEN */ |
/* Enable assembly routines */ |
#define SDL_ASSEMBLY_ROUTINES 1 |