Backed out SDL_config.h overwrite that got committed by accident.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 30 Aug 2011 17:11:51 -0400
changeset 5853bdfb7a2a86e1
parent 5852 f020f8293eb8
child 5856 173d28fd4be4
Backed out SDL_config.h overwrite that got committed by accident.
include/SDL_config.h
     1.1 --- a/include/SDL_config.h	Mon Aug 29 13:17:07 2011 -0400
     1.2 +++ b/include/SDL_config.h	Tue Aug 30 17:11:51 2011 -0400
     1.3 @@ -1,4 +1,3 @@
     1.4 -/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
     1.5  /*
     1.6    Simple DirectMedia Layer
     1.7    Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
     1.8 @@ -23,273 +22,27 @@
     1.9  #ifndef _SDL_config_h
    1.10  #define _SDL_config_h
    1.11  
    1.12 -/**
    1.13 - *  \file SDL_config.h.in
    1.14 - *
    1.15 - *  This is a set of defines to configure the SDL features
    1.16 - */
    1.17 -
    1.18 -/* General platform specific identifiers */
    1.19  #include "SDL_platform.h"
    1.20  
    1.21 -/* Make sure that this isn't included by Visual C++ */
    1.22 -#ifdef _MSC_VER
    1.23 -#error You should run hg revert SDL_config.h 
    1.24 -#endif
    1.25 -
    1.26 -/* C language features */
    1.27 -/* #undef const */
    1.28 -/* #undef inline */
    1.29 -/* #undef volatile */
    1.30 -
    1.31 -/* C datatypes */
    1.32 -#define SIZEOF_VOIDP 8
    1.33 -#define HAVE_GCC_ATOMICS 1
    1.34 -/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
    1.35 -
    1.36 -/* Comment this if you want to build without any C library requirements */
    1.37 -#define HAVE_LIBC 1
    1.38 -#if HAVE_LIBC
    1.39 -
    1.40 -/* Useful headers */
    1.41 -#define HAVE_ALLOCA_H 1
    1.42 -#define HAVE_SYS_TYPES_H 1
    1.43 -#define HAVE_STDIO_H 1
    1.44 -#define STDC_HEADERS 1
    1.45 -#define HAVE_STDLIB_H 1
    1.46 -#define HAVE_STDARG_H 1
    1.47 -/* #undef HAVE_MALLOC_H */
    1.48 -#define HAVE_MEMORY_H 1
    1.49 -#define HAVE_STRING_H 1
    1.50 -#define HAVE_STRINGS_H 1
    1.51 -#define HAVE_INTTYPES_H 1
    1.52 -#define HAVE_STDINT_H 1
    1.53 -#define HAVE_CTYPE_H 1
    1.54 -#define HAVE_MATH_H 1
    1.55 -#define HAVE_ICONV_H 1
    1.56 -#define HAVE_SIGNAL_H 1
    1.57 -/* #undef HAVE_ALTIVEC_H */
    1.58 -
    1.59 -/* C library functions */
    1.60 -#define HAVE_MALLOC 1
    1.61 -#define HAVE_CALLOC 1
    1.62 -#define HAVE_REALLOC 1
    1.63 -#define HAVE_FREE 1
    1.64 -#define HAVE_ALLOCA 1
    1.65 -#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
    1.66 -#define HAVE_GETENV 1
    1.67 -#define HAVE_SETENV 1
    1.68 -#define HAVE_PUTENV 1
    1.69 -#define HAVE_UNSETENV 1
    1.70 -#endif
    1.71 -#define HAVE_QSORT 1
    1.72 -#define HAVE_ABS 1
    1.73 -#define HAVE_BCOPY 1
    1.74 -#define HAVE_MEMSET 1
    1.75 -#define HAVE_MEMCPY 1
    1.76 -#define HAVE_MEMMOVE 1
    1.77 -#define HAVE_MEMCMP 1
    1.78 -#define HAVE_STRLEN 1
    1.79 -#define HAVE_STRLCPY 1
    1.80 -#define HAVE_STRLCAT 1
    1.81 -#define HAVE_STRDUP 1
    1.82 -/* #undef HAVE__STRREV */
    1.83 -/* #undef HAVE__STRUPR */
    1.84 -/* #undef HAVE__STRLWR */
    1.85 -/* #undef HAVE_INDEX */
    1.86 -/* #undef HAVE_RINDEX */
    1.87 -#define HAVE_STRCHR 1
    1.88 -#define HAVE_STRRCHR 1
    1.89 -#define HAVE_STRSTR 1
    1.90 -/* #undef HAVE_ITOA */
    1.91 -/* #undef HAVE__LTOA */
    1.92 -/* #undef HAVE__UITOA */
    1.93 -/* #undef HAVE__ULTOA */
    1.94 -#define HAVE_STRTOL 1
    1.95 -#define HAVE_STRTOUL 1
    1.96 -/* #undef HAVE__I64TOA */
    1.97 -/* #undef HAVE__UI64TOA */
    1.98 -#define HAVE_STRTOLL 1
    1.99 -#define HAVE_STRTOULL 1
   1.100 -#define HAVE_STRTOD 1
   1.101 -#define HAVE_ATOI 1
   1.102 -#define HAVE_ATOF 1
   1.103 -#define HAVE_STRCMP 1
   1.104 -#define HAVE_STRNCMP 1
   1.105 -/* #undef HAVE__STRICMP */
   1.106 -#define HAVE_STRCASECMP 1
   1.107 -/* #undef HAVE__STRNICMP */
   1.108 -#define HAVE_STRNCASECMP 1
   1.109 -#define HAVE_SSCANF 1
   1.110 -#define HAVE_SNPRINTF 1
   1.111 -#define HAVE_VSNPRINTF 1
   1.112 -#define HAVE_M_PI 
   1.113 -#define HAVE_ATAN 1
   1.114 -#define HAVE_ATAN2 1
   1.115 -#define HAVE_CEIL 1
   1.116 -#define HAVE_COPYSIGN 1
   1.117 -#define HAVE_COS 1
   1.118 -#define HAVE_COSF 1
   1.119 -#define HAVE_FABS 1
   1.120 -#define HAVE_FLOOR 1
   1.121 -#define HAVE_LOG 1
   1.122 -#define HAVE_POW 1
   1.123 -#define HAVE_SCALBN 1
   1.124 -#define HAVE_SIN 1
   1.125 -#define HAVE_SINF 1
   1.126 -#define HAVE_SQRT 1
   1.127 -#define HAVE_SIGACTION 1
   1.128 -#define HAVE_SETJMP 1
   1.129 -#define HAVE_NANOSLEEP 1
   1.130 -#define HAVE_SYSCONF 1
   1.131 -#define HAVE_SYSCTLBYNAME 1
   1.132 -/* #undef HAVE_CLOCK_GETTIME */
   1.133 -/* #undef HAVE_GETPAGESIZE */
   1.134 -#define HAVE_MPROTECT 1
   1.135 -#define HAVE_ICONV 1
   1.136 -
   1.137 +/**
   1.138 + *  \file SDL_config.h
   1.139 + *
   1.140 + *  SDL_config.h for any platform that doesn't build using the configure system.
   1.141 + */
   1.142 + 
   1.143 +/* Add any platform that doesn't build using the configure system. */
   1.144 +#if defined(__WIN32__)
   1.145 +#include "SDL_config_windows.h"
   1.146 +#elif defined(__MACOSX__)
   1.147 +#include "SDL_config_macosx.h"
   1.148 +#elif defined(__IPHONEOS__) 
   1.149 +#include "SDL_config_iphoneos.h"
   1.150 +#elif defined(__ANDROID__)
   1.151 +#include "SDL_config_android.h"
   1.152 +#elif defined(__NINTENDODS__)
   1.153 +#include "SDL_config_nintendods.h"
   1.154  #else
   1.155 -/* We may need some replacement for stdarg.h here */
   1.156 -#include <stdarg.h>
   1.157 -#endif /* HAVE_LIBC */
   1.158 -
   1.159 -/* SDL internal assertion support */
   1.160 -/* #undef SDL_DEFAULT_ASSERT_LEVEL */
   1.161 -
   1.162 -/* Allow disabling of core subsystems */
   1.163 -/* #undef SDL_ATOMIC_DISABLED */
   1.164 -/* #undef SDL_AUDIO_DISABLED */
   1.165 -/* #undef SDL_CPUINFO_DISABLED */
   1.166 -/* #undef SDL_EVENTS_DISABLED */
   1.167 -/* #undef SDL_FILE_DISABLED */
   1.168 -/* #undef SDL_JOYSTICK_DISABLED */
   1.169 -/* #undef SDL_HAPTIC_DISABLED */
   1.170 -/* #undef SDL_LOADSO_DISABLED */
   1.171 -/* #undef SDL_RENDER_DISABLED */
   1.172 -/* #undef SDL_THREADS_DISABLED */
   1.173 -/* #undef SDL_TIMERS_DISABLED */
   1.174 -/* #undef SDL_VIDEO_DISABLED */
   1.175 -/* #undef SDL_POWER_DISABLED */
   1.176 -
   1.177 -/* Enable various audio drivers */
   1.178 -/* #undef SDL_AUDIO_DRIVER_ALSA */
   1.179 -/* #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
   1.180 -/* #undef SDL_AUDIO_DRIVER_ARTS */
   1.181 -/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
   1.182 -/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
   1.183 -/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
   1.184 -/* #undef SDL_AUDIO_DRIVER_BEOSAUDIO */
   1.185 -/* #undef SDL_AUDIO_DRIVER_BSD */
   1.186 -#define SDL_AUDIO_DRIVER_COREAUDIO 1
   1.187 -#define SDL_AUDIO_DRIVER_DISK 1
   1.188 -#define SDL_AUDIO_DRIVER_DUMMY 1
   1.189 -/* #undef SDL_AUDIO_DRIVER_DSOUND */
   1.190 -/* #undef SDL_AUDIO_DRIVER_ESD */
   1.191 -/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   1.192 -/* #undef SDL_AUDIO_DRIVER_NAS */
   1.193 -/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
   1.194 -/* #undef SDL_AUDIO_DRIVER_NDS */
   1.195 -/* #undef SDL_AUDIO_DRIVER_OSS */
   1.196 -/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   1.197 -/* #undef SDL_AUDIO_DRIVER_PAUDIO */
   1.198 -/* #undef SDL_AUDIO_DRIVER_QSA */
   1.199 -/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   1.200 -/* #undef SDL_AUDIO_DRIVER_WINWAVEOUT */
   1.201 -/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
   1.202 -/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
   1.203 -
   1.204 -/* Enable various input drivers */
   1.205 -/* #undef SDL_INPUT_LINUXEV */
   1.206 -/* #undef SDL_INPUT_TSLIB */
   1.207 -/* #undef SDL_JOYSTICK_BEOS */
   1.208 -/* #undef SDL_JOYSTICK_DINPUT */
   1.209 -/* #undef SDL_JOYSTICK_DUMMY */
   1.210 -#define SDL_JOYSTICK_IOKIT 1
   1.211 -/* #undef SDL_JOYSTICK_LINUX */
   1.212 -/* #undef SDL_JOYSTICK_NDS */
   1.213 -/* #undef SDL_JOYSTICK_WINMM */
   1.214 -/* #undef SDL_JOYSTICK_USBHID */
   1.215 -/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
   1.216 -/* #undef SDL_HAPTIC_DUMMY */
   1.217 -/* #undef SDL_HAPTIC_LINUX */
   1.218 -#define SDL_HAPTIC_IOKIT 1
   1.219 -/* #undef SDL_HAPTIC_DINPUT */
   1.220 -
   1.221 -/* Enable various shared object loading systems */
   1.222 -/* #undef SDL_LOADSO_BEOS */
   1.223 -/* #undef SDL_LOADSO_DLCOMPAT */
   1.224 -#define SDL_LOADSO_DLOPEN 1
   1.225 -/* #undef SDL_LOADSO_DUMMY */
   1.226 -/* #undef SDL_LOADSO_LDG */
   1.227 -/* #undef SDL_LOADSO_WINDOWS */
   1.228 -
   1.229 -/* Enable various threading systems */
   1.230 -/* #undef SDL_THREAD_BEOS */
   1.231 -/* #undef SDL_THREAD_NDS */
   1.232 -#define SDL_THREAD_PTHREAD 1
   1.233 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   1.234 -/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   1.235 -/* #undef SDL_THREAD_SPROC */
   1.236 -/* #undef SDL_THREAD_WINDOWS */
   1.237 -
   1.238 -/* Enable various timer systems */
   1.239 -/* #undef SDL_TIMER_BEOS */
   1.240 -/* #undef SDL_TIMER_DUMMY */
   1.241 -/* #undef SDL_TIMER_NDS */
   1.242 -#define SDL_TIMER_UNIX 1
   1.243 -/* #undef SDL_TIMER_WINDOWS */
   1.244 -/* #undef SDL_TIMER_WINCE */
   1.245 -
   1.246 -/* Enable various video drivers */
   1.247 -/* #undef SDL_VIDEO_DRIVER_BWINDOW */
   1.248 -#define SDL_VIDEO_DRIVER_COCOA 1
   1.249 -/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   1.250 -/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
   1.251 -#define SDL_VIDEO_DRIVER_DUMMY 1
   1.252 -/* #undef SDL_VIDEO_DRIVER_NDS */
   1.253 -/* #undef SDL_VIDEO_DRIVER_WINDOWS */
   1.254 -#define SDL_VIDEO_DRIVER_X11 1
   1.255 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
   1.256 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
   1.257 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "/usr/X11R6/lib/libXcursor.1.dylib"
   1.258 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
   1.259 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT "/usr/X11R6/lib/libXi.6.dylib"
   1.260 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
   1.261 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
   1.262 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
   1.263 -#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
   1.264 -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   1.265 -#define SDL_VIDEO_DRIVER_X11_XINPUT 1
   1.266 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   1.267 -#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
   1.268 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
   1.269 -#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
   1.270 -
   1.271 -/* #undef SDL_VIDEO_RENDER_D3D */
   1.272 -#define SDL_VIDEO_RENDER_OGL 1
   1.273 -/* #undef SDL_VIDEO_RENDER_OGL_ES */
   1.274 -/* #undef SDL_VIDEO_RENDER_DIRECTFB */
   1.275 -
   1.276 -/* Enable OpenGL support */
   1.277 -#define SDL_VIDEO_OPENGL 1
   1.278 -/* #undef SDL_VIDEO_OPENGL_ES */
   1.279 -/* #undef SDL_VIDEO_OPENGL_BGL */
   1.280 -#define SDL_VIDEO_OPENGL_CGL 1
   1.281 -#define SDL_VIDEO_OPENGL_GLX 1
   1.282 -/* #undef SDL_VIDEO_OPENGL_WGL */
   1.283 -/* #undef SDL_VIDEO_OPENGL_OSMESA */
   1.284 -/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   1.285 -
   1.286 -/* Enable system power support */
   1.287 -/* #undef SDL_POWER_LINUX */
   1.288 -/* #undef SDL_POWER_WINDOWS */
   1.289 -#define SDL_POWER_MACOSX 1
   1.290 -/* #undef SDL_POWER_BEOS */
   1.291 -/* #undef SDL_POWER_NINTENDODS */
   1.292 -/* #undef SDL_POWER_HARDWIRED */
   1.293 -
   1.294 -/* Enable assembly routines */
   1.295 -#define SDL_ASSEMBLY_ROUTINES 1
   1.296 -/* #undef SDL_ALTIVEC_BLITTERS */
   1.297 +#include "SDL_config_minimal.h"
   1.298 +#endif /* platform config */
   1.299  
   1.300  #endif /* _SDL_config_h */