mirror of https://github.com/encounter/SDL.git
revert files I didnt mean to commit!
This commit is contained in:
parent
e27f12e0da
commit
e564da78b7
|
@ -745,7 +745,6 @@ infodir
|
||||||
docdir
|
docdir
|
||||||
oldincludedir
|
oldincludedir
|
||||||
includedir
|
includedir
|
||||||
runstatedir
|
|
||||||
localstatedir
|
localstatedir
|
||||||
sharedstatedir
|
sharedstatedir
|
||||||
sysconfdir
|
sysconfdir
|
||||||
|
@ -923,7 +922,6 @@ datadir='${datarootdir}'
|
||||||
sysconfdir='${prefix}/etc'
|
sysconfdir='${prefix}/etc'
|
||||||
sharedstatedir='${prefix}/com'
|
sharedstatedir='${prefix}/com'
|
||||||
localstatedir='${prefix}/var'
|
localstatedir='${prefix}/var'
|
||||||
runstatedir='${localstatedir}/run'
|
|
||||||
includedir='${prefix}/include'
|
includedir='${prefix}/include'
|
||||||
oldincludedir='/usr/include'
|
oldincludedir='/usr/include'
|
||||||
docdir='${datarootdir}/doc/${PACKAGE}'
|
docdir='${datarootdir}/doc/${PACKAGE}'
|
||||||
|
@ -1176,15 +1174,6 @@ do
|
||||||
| -silent | --silent | --silen | --sile | --sil)
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
silent=yes ;;
|
silent=yes ;;
|
||||||
|
|
||||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
||||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
|
||||||
| --run | --ru | --r)
|
|
||||||
ac_prev=runstatedir ;;
|
|
||||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
||||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
||||||
| --run=* | --ru=* | --r=*)
|
|
||||||
runstatedir=$ac_optarg ;;
|
|
||||||
|
|
||||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
ac_prev=sbindir ;;
|
ac_prev=sbindir ;;
|
||||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
|
@ -1322,7 +1311,7 @@ fi
|
||||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
libdir localedir mandir runstatedir
|
libdir localedir mandir
|
||||||
do
|
do
|
||||||
eval ac_val=\$$ac_var
|
eval ac_val=\$$ac_var
|
||||||
# Remove trailing slashes.
|
# Remove trailing slashes.
|
||||||
|
@ -1475,7 +1464,6 @@ Fine tuning of the installation directories:
|
||||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
||||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
--includedir=DIR C header files [PREFIX/include]
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
|
@ -19116,7 +19104,6 @@ $as_echo "$need_gcc_Wno_multichar" >&6; }
|
||||||
|
|
||||||
CheckWayland()
|
CheckWayland()
|
||||||
{
|
{
|
||||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall -Wmissing-field-initializers"
|
|
||||||
# Check whether --enable-video-wayland was given.
|
# Check whether --enable-video-wayland was given.
|
||||||
if test "${enable_video_wayland+set}" = set; then :
|
if test "${enable_video_wayland+set}" = set; then :
|
||||||
enableval=$enable_video_wayland;
|
enableval=$enable_video_wayland;
|
||||||
|
|
|
@ -1366,7 +1366,6 @@ CheckWarnAll()
|
||||||
dnl Check for Wayland
|
dnl Check for Wayland
|
||||||
CheckWayland()
|
CheckWayland()
|
||||||
{
|
{
|
||||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall -Wmissing-field-initializers"
|
|
||||||
AC_ARG_ENABLE(video-wayland,
|
AC_ARG_ENABLE(video-wayland,
|
||||||
AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
|
AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
|
||||||
,enable_video_wayland=yes)
|
,enable_video_wayland=yes)
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
|
|
||||||
/*
|
/*
|
||||||
Simple DirectMedia Layer
|
Simple DirectMedia Layer
|
||||||
Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
|
Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
|
||||||
|
@ -23,371 +22,32 @@
|
||||||
#ifndef SDL_config_h_
|
#ifndef SDL_config_h_
|
||||||
#define SDL_config_h_
|
#define SDL_config_h_
|
||||||
|
|
||||||
/**
|
|
||||||
* \file SDL_config.h.in
|
|
||||||
*
|
|
||||||
* This is a set of defines to configure the SDL features
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* General platform specific identifiers */
|
|
||||||
#include "SDL_platform.h"
|
#include "SDL_platform.h"
|
||||||
|
|
||||||
/* Make sure that this isn't included by Visual C++ */
|
/**
|
||||||
#ifdef _MSC_VER
|
* \file SDL_config.h
|
||||||
#error You should run hg revert SDL_config.h
|
*/
|
||||||
#endif
|
|
||||||
|
|
||||||
/* C language features */
|
/* Add any platform that doesn't build using the configure system. */
|
||||||
/* #undef const */
|
#if defined(__WIN32__)
|
||||||
/* #undef inline */
|
#include "SDL_config_windows.h"
|
||||||
/* #undef volatile */
|
#elif defined(__WINRT__)
|
||||||
|
#include "SDL_config_winrt.h"
|
||||||
/* C datatypes */
|
#elif defined(__MACOSX__)
|
||||||
#ifdef __LP64__
|
#include "SDL_config_macosx.h"
|
||||||
#define SIZEOF_VOIDP 8
|
#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
|
#else
|
||||||
#define SIZEOF_VOIDP 4
|
/* This is a minimal configuration just to get SDL running on new platforms */
|
||||||
|
#include "SDL_config_minimal.h"
|
||||||
|
#endif /* platform config */
|
||||||
|
|
||||||
|
#ifdef USING_GENERATED_CONFIG_H
|
||||||
|
#error Wrong SDL_config.h, check your include path?
|
||||||
#endif
|
#endif
|
||||||
#define HAVE_GCC_ATOMICS 1
|
|
||||||
/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
|
|
||||||
|
|
||||||
/* Comment this if you want to build without any C library requirements */
|
|
||||||
#define HAVE_LIBC 1
|
|
||||||
#if HAVE_LIBC
|
|
||||||
|
|
||||||
/* Useful headers */
|
|
||||||
#define STDC_HEADERS 1
|
|
||||||
#define HAVE_ALLOCA_H 1
|
|
||||||
#define HAVE_CTYPE_H 1
|
|
||||||
#define HAVE_FLOAT_H 1
|
|
||||||
#define HAVE_ICONV_H 1
|
|
||||||
#define HAVE_INTTYPES_H 1
|
|
||||||
#define HAVE_LIMITS_H 1
|
|
||||||
#define HAVE_MALLOC_H 1
|
|
||||||
#define HAVE_MATH_H 1
|
|
||||||
#define HAVE_MEMORY_H 1
|
|
||||||
#define HAVE_SIGNAL_H 1
|
|
||||||
#define HAVE_STDARG_H 1
|
|
||||||
#define HAVE_STDINT_H 1
|
|
||||||
#define HAVE_STDIO_H 1
|
|
||||||
#define HAVE_STDLIB_H 1
|
|
||||||
#define HAVE_STRINGS_H 1
|
|
||||||
#define HAVE_STRING_H 1
|
|
||||||
#define HAVE_SYS_TYPES_H 1
|
|
||||||
#define HAVE_WCHAR_H 1
|
|
||||||
/* #undef HAVE_PTHREAD_NP_H */
|
|
||||||
|
|
||||||
/* C library functions */
|
|
||||||
#define HAVE_MALLOC 1
|
|
||||||
#define HAVE_CALLOC 1
|
|
||||||
#define HAVE_REALLOC 1
|
|
||||||
#define HAVE_FREE 1
|
|
||||||
#define HAVE_ALLOCA 1
|
|
||||||
#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
|
|
||||||
#define HAVE_GETENV 1
|
|
||||||
#define HAVE_SETENV 1
|
|
||||||
#define HAVE_PUTENV 1
|
|
||||||
#define HAVE_UNSETENV 1
|
|
||||||
#endif
|
|
||||||
#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_WCSLEN 1
|
|
||||||
/* #undef HAVE_WCSLCPY */
|
|
||||||
/* #undef HAVE_WCSLCAT */
|
|
||||||
#define HAVE_WCSCMP 1
|
|
||||||
#define HAVE_STRLEN 1
|
|
||||||
/* #undef HAVE_STRLCPY */
|
|
||||||
/* #undef HAVE_STRLCAT */
|
|
||||||
#define HAVE_STRDUP 1
|
|
||||||
/* #undef HAVE__STRREV */
|
|
||||||
/* #undef HAVE__STRUPR */
|
|
||||||
/* #undef HAVE__STRLWR */
|
|
||||||
/* #undef HAVE_INDEX */
|
|
||||||
/* #undef HAVE_RINDEX */
|
|
||||||
#define HAVE_STRCHR 1
|
|
||||||
#define HAVE_STRRCHR 1
|
|
||||||
#define HAVE_STRSTR 1
|
|
||||||
/* #undef HAVE_ITOA */
|
|
||||||
/* #undef HAVE__LTOA */
|
|
||||||
/* #undef HAVE__UITOA */
|
|
||||||
/* #undef HAVE__ULTOA */
|
|
||||||
#define HAVE_STRTOL 1
|
|
||||||
#define HAVE_STRTOUL 1
|
|
||||||
/* #undef HAVE__I64TOA */
|
|
||||||
/* #undef HAVE__UI64TOA */
|
|
||||||
#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
|
|
||||||
/* #undef HAVE__STRICMP */
|
|
||||||
#define HAVE_STRCASECMP 1
|
|
||||||
/* #undef HAVE__STRNICMP */
|
|
||||||
#define HAVE_STRNCASECMP 1
|
|
||||||
/* #undef HAVE_SSCANF */
|
|
||||||
#define HAVE_VSSCANF 1
|
|
||||||
/* #undef HAVE_SNPRINTF */
|
|
||||||
#define HAVE_VSNPRINTF 1
|
|
||||||
#define HAVE_M_PI /**/
|
|
||||||
#define HAVE_ATAN 1
|
|
||||||
#define HAVE_ATAN2 1
|
|
||||||
#define HAVE_ACOS 1
|
|
||||||
#define HAVE_ASIN 1
|
|
||||||
#define HAVE_CEIL 1
|
|
||||||
#define HAVE_COPYSIGN 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_SCALBN 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_FOPEN64 1
|
|
||||||
#define HAVE_FSEEKO 1
|
|
||||||
#define HAVE_FSEEKO64 1
|
|
||||||
#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
|
|
||||||
/* #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
|
|
||||||
#define HAVE_GETAUXVAL 1
|
|
||||||
#define HAVE_POLL 1
|
|
||||||
|
|
||||||
#else
|
|
||||||
#define HAVE_STDARG_H 1
|
|
||||||
#define HAVE_STDDEF_H 1
|
|
||||||
#define HAVE_STDINT_H 1
|
|
||||||
#endif /* HAVE_LIBC */
|
|
||||||
|
|
||||||
/* #undef HAVE_ALTIVEC_H */
|
|
||||||
#define HAVE_LIBUDEV_H 1
|
|
||||||
#define HAVE_DBUS_DBUS_H 1
|
|
||||||
#define HAVE_IBUS_IBUS_H 1
|
|
||||||
/* #undef HAVE_FCITX_FRONTEND_H */
|
|
||||||
#define HAVE_LIBSAMPLERATE_H 1
|
|
||||||
|
|
||||||
/* #undef HAVE_DDRAW_H */
|
|
||||||
/* #undef HAVE_DINPUT_H */
|
|
||||||
/* #undef HAVE_DSOUND_H */
|
|
||||||
/* #undef HAVE_DXGI_H */
|
|
||||||
/* #undef HAVE_XINPUT_H */
|
|
||||||
/* #undef HAVE_XINPUT_GAMEPAD_EX */
|
|
||||||
/* #undef HAVE_XINPUT_STATE_EX */
|
|
||||||
|
|
||||||
/* SDL internal assertion support */
|
|
||||||
/* #undef SDL_DEFAULT_ASSERT_LEVEL */
|
|
||||||
|
|
||||||
/* Allow disabling of core subsystems */
|
|
||||||
/* #undef SDL_ATOMIC_DISABLED */
|
|
||||||
/* #undef SDL_AUDIO_DISABLED */
|
|
||||||
/* #undef SDL_CPUINFO_DISABLED */
|
|
||||||
/* #undef SDL_EVENTS_DISABLED */
|
|
||||||
/* #undef SDL_FILE_DISABLED */
|
|
||||||
/* #undef SDL_JOYSTICK_DISABLED */
|
|
||||||
/* #undef SDL_HAPTIC_DISABLED */
|
|
||||||
/* #undef SDL_LOADSO_DISABLED */
|
|
||||||
/* #undef SDL_RENDER_DISABLED */
|
|
||||||
/* #undef SDL_THREADS_DISABLED */
|
|
||||||
/* #undef SDL_TIMERS_DISABLED */
|
|
||||||
/* #undef SDL_VIDEO_DISABLED */
|
|
||||||
/* #undef SDL_POWER_DISABLED */
|
|
||||||
/* #undef SDL_FILESYSTEM_DISABLED */
|
|
||||||
|
|
||||||
/* Enable various audio drivers */
|
|
||||||
#define SDL_AUDIO_DRIVER_ALSA 1
|
|
||||||
#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_ANDROID */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_ARTS */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
|
|
||||||
#define SDL_AUDIO_DRIVER_DISK 1
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_DSOUND */
|
|
||||||
#define SDL_AUDIO_DRIVER_DUMMY 1
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_ESD */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_HAIKU */
|
|
||||||
#define SDL_AUDIO_DRIVER_JACK 1
|
|
||||||
#define SDL_AUDIO_DRIVER_JACK_DYNAMIC "libjack.so.0"
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_NACL */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_NAS */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_NETBSD */
|
|
||||||
#define SDL_AUDIO_DRIVER_OSS 1
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_PAUDIO */
|
|
||||||
#define SDL_AUDIO_DRIVER_PULSEAUDIO 1
|
|
||||||
#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC "libpulse-simple.so.0"
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_QSA */
|
|
||||||
#define SDL_AUDIO_DRIVER_SNDIO 1
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_WASAPI */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_WINMM */
|
|
||||||
/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
|
|
||||||
|
|
||||||
/* Enable various input drivers */
|
|
||||||
#define SDL_INPUT_LINUXEV 1
|
|
||||||
#define SDL_INPUT_LINUXKD 1
|
|
||||||
/* #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_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_IOKIT */
|
|
||||||
/* #undef SDL_HAPTIC_DINPUT */
|
|
||||||
/* #undef SDL_HAPTIC_XINPUT */
|
|
||||||
|
|
||||||
/* Enable various shared object loading systems */
|
|
||||||
#define SDL_LOADSO_DLOPEN 1
|
|
||||||
/* #undef SDL_LOADSO_DUMMY */
|
|
||||||
/* #undef SDL_LOADSO_LDG */
|
|
||||||
/* #undef SDL_LOADSO_WINDOWS */
|
|
||||||
|
|
||||||
/* Enable various threading systems */
|
|
||||||
#define SDL_THREAD_PTHREAD 1
|
|
||||||
#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
|
|
||||||
/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
|
|
||||||
/* #undef SDL_THREAD_WINDOWS */
|
|
||||||
|
|
||||||
/* Enable various timer systems */
|
|
||||||
/* #undef SDL_TIMER_HAIKU */
|
|
||||||
/* #undef SDL_TIMER_DUMMY */
|
|
||||||
#define SDL_TIMER_UNIX 1
|
|
||||||
/* #undef SDL_TIMER_WINDOWS */
|
|
||||||
|
|
||||||
/* Enable various video drivers */
|
|
||||||
/* #undef SDL_VIDEO_DRIVER_HAIKU */
|
|
||||||
/* #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_WINDOWS */
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND 1
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH 1
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC "libwayland-client.so.0"
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL "libwayland-egl.so.1"
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR "libwayland-cursor.so.0"
|
|
||||||
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON "libxkbcommon.so.0"
|
|
||||||
/* #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_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 */
|
|
||||||
#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_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 */
|
|
||||||
#define SDL_VIDEO_RENDER_OGL 1
|
|
||||||
/* #undef SDL_VIDEO_RENDER_OGL_ES */
|
|
||||||
#define SDL_VIDEO_RENDER_OGL_ES2 1
|
|
||||||
/* #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_BGL */
|
|
||||||
/* #undef SDL_VIDEO_OPENGL_CGL */
|
|
||||||
#define SDL_VIDEO_OPENGL_EGL 1
|
|
||||||
#define SDL_VIDEO_OPENGL_GLX 1
|
|
||||||
/* #undef SDL_VIDEO_OPENGL_WGL */
|
|
||||||
/* #undef SDL_VIDEO_OPENGL_OSMESA */
|
|
||||||
/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
|
|
||||||
|
|
||||||
/* Enable Vulkan support */
|
|
||||||
#define SDL_VIDEO_VULKAN 1
|
|
||||||
|
|
||||||
/* Enable system power support */
|
|
||||||
#define SDL_POWER_LINUX 1
|
|
||||||
/* #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 */
|
|
||||||
/* #undef SDL_FILESYSTEM_HAIKU */
|
|
||||||
/* #undef SDL_FILESYSTEM_COCOA */
|
|
||||||
/* #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
|
|
||||||
/* #undef SDL_ALTIVEC_BLITTERS */
|
|
||||||
|
|
||||||
/* Enable ime support */
|
|
||||||
#define SDL_USE_IME 1
|
|
||||||
|
|
||||||
/* Enable dynamic udev support */
|
|
||||||
#define SDL_UDEV_DYNAMIC "libudev.so.1"
|
|
||||||
|
|
||||||
/* Enable dynamic libsamplerate support */
|
|
||||||
#define SDL_LIBSAMPLERATE_DYNAMIC "libsamplerate.so.0"
|
|
||||||
|
|
||||||
#endif /* SDL_config_h_ */
|
#endif /* SDL_config_h_ */
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
#define SDL_REVISION "hg-11511:833d4fbb3d76"
|
#define SDL_REVISION "hg-0:aaaaaaaaaaah"
|
||||||
#define SDL_REVISION_NUMBER 11511
|
#define SDL_REVISION_NUMBER 0
|
||||||
|
|
|
@ -167,7 +167,6 @@ void
|
||||||
SDL_UDEV_Quit(void)
|
SDL_UDEV_Quit(void)
|
||||||
{
|
{
|
||||||
SDL_UDEV_CallbackList *item;
|
SDL_UDEV_CallbackList *item;
|
||||||
printf("We do indeed get here\n");
|
|
||||||
|
|
||||||
if (_this == NULL) {
|
if (_this == NULL) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -47,7 +47,6 @@ SDL_LoadObject(const char *sofile)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
printf("SOFILE: %s\n", sofile);
|
|
||||||
handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL);
|
handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL);
|
||||||
loaderror = (char *) dlerror();
|
loaderror = (char *) dlerror();
|
||||||
if (handle == NULL) {
|
if (handle == NULL) {
|
||||||
|
|
|
@ -177,8 +177,6 @@ static SDL_bool SDL_EGL_HasExtension(_THIS, SDL_EGL_ExtensionType type, const ch
|
||||||
if (egl_extstr != NULL) {
|
if (egl_extstr != NULL) {
|
||||||
ext_start = egl_extstr;
|
ext_start = egl_extstr;
|
||||||
|
|
||||||
printf("%s\n", ext_start);
|
|
||||||
|
|
||||||
while (*ext_start) {
|
while (*ext_start) {
|
||||||
ext_start = SDL_strstr(ext_start, ext);
|
ext_start = SDL_strstr(ext_start, ext);
|
||||||
if (ext_start == NULL) {
|
if (ext_start == NULL) {
|
||||||
|
|
|
@ -637,7 +637,6 @@ infodir
|
||||||
docdir
|
docdir
|
||||||
oldincludedir
|
oldincludedir
|
||||||
includedir
|
includedir
|
||||||
runstatedir
|
|
||||||
localstatedir
|
localstatedir
|
||||||
sharedstatedir
|
sharedstatedir
|
||||||
sysconfdir
|
sysconfdir
|
||||||
|
@ -718,7 +717,6 @@ datadir='${datarootdir}'
|
||||||
sysconfdir='${prefix}/etc'
|
sysconfdir='${prefix}/etc'
|
||||||
sharedstatedir='${prefix}/com'
|
sharedstatedir='${prefix}/com'
|
||||||
localstatedir='${prefix}/var'
|
localstatedir='${prefix}/var'
|
||||||
runstatedir='${localstatedir}/run'
|
|
||||||
includedir='${prefix}/include'
|
includedir='${prefix}/include'
|
||||||
oldincludedir='/usr/include'
|
oldincludedir='/usr/include'
|
||||||
docdir='${datarootdir}/doc/${PACKAGE}'
|
docdir='${datarootdir}/doc/${PACKAGE}'
|
||||||
|
@ -971,15 +969,6 @@ do
|
||||||
| -silent | --silent | --silen | --sile | --sil)
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
silent=yes ;;
|
silent=yes ;;
|
||||||
|
|
||||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
||||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
|
||||||
| --run | --ru | --r)
|
|
||||||
ac_prev=runstatedir ;;
|
|
||||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
||||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
||||||
| --run=* | --ru=* | --r=*)
|
|
||||||
runstatedir=$ac_optarg ;;
|
|
||||||
|
|
||||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
ac_prev=sbindir ;;
|
ac_prev=sbindir ;;
|
||||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
|
@ -1117,7 +1106,7 @@ fi
|
||||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
libdir localedir mandir runstatedir
|
libdir localedir mandir
|
||||||
do
|
do
|
||||||
eval ac_val=\$$ac_var
|
eval ac_val=\$$ac_var
|
||||||
# Remove trailing slashes.
|
# Remove trailing slashes.
|
||||||
|
@ -1270,7 +1259,6 @@ Fine tuning of the installation directories:
|
||||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
||||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
--includedir=DIR C header files [PREFIX/include]
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
|
|
|
@ -261,8 +261,6 @@ main(int argc, char *argv[])
|
||||||
state->gl_blue_size = 5;
|
state->gl_blue_size = 5;
|
||||||
state->gl_depth_size = 16;
|
state->gl_depth_size = 16;
|
||||||
state->gl_double_buffer = 1;
|
state->gl_double_buffer = 1;
|
||||||
state->gl_major_version = 3;
|
|
||||||
state->gl_minor_version = 3;
|
|
||||||
if (fsaa) {
|
if (fsaa) {
|
||||||
state->gl_multisamplebuffers = 1;
|
state->gl_multisamplebuffers = 1;
|
||||||
state->gl_multisamplesamples = fsaa;
|
state->gl_multisamplesamples = fsaa;
|
||||||
|
|
Loading…
Reference in New Issue