Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Automated merge with https://bitbucket.org/Markusk/sdl-gsoc

  • Loading branch information
icculus committed Aug 29, 2011
2 parents 232c427 + b82e4c7 commit 88605bba0ff5dce0cb4b825b6271a4f42dbf47fc
Showing with 40,895 additions and 1,892 deletions.
  1. +265 −18 include/SDL_config.h
  2. +2 −2 include/SDL_revision.h
  3. +3 −0 src/SDL_error.c
  4. +2 −2 test/automated/Makefile
  5. +1,736 −1,870 test/configure
  6. 0 test/test-automation/AUTHORS
  7. +24 −0 test/test-automation/COPYING
  8. 0 test/test-automation/ChangeLog
  9. +1,473 −0 test/test-automation/DoxyFile
  10. +18 −0 test/test-automation/INSTALL
  11. +26 −0 test/test-automation/Makefile.am
  12. 0 test/test-automation/NEWS
  13. +12 −0 test/test-automation/README
  14. +11 −0 test/test-automation/TODO
  15. +7,357 −0 test/test-automation/acinclude/libtool.m4
  16. +368 −0 test/test-automation/acinclude/ltoptions.m4
  17. +123 −0 test/test-automation/acinclude/ltsugar.m4
  18. +23 −0 test/test-automation/acinclude/ltversion.m4
  19. +92 −0 test/test-automation/acinclude/lt~obsolete.m4
  20. +991 −0 test/test-automation/aclocal.m4
  21. +11 −0 test/test-automation/autogen.sh
  22. +143 −0 test/test-automation/build-scripts/compile
  23. +1,502 −0 test/test-automation/build-scripts/config.guess
  24. +1,714 −0 test/test-automation/build-scripts/config.sub
  25. +630 −0 test/test-automation/build-scripts/depcomp
  26. +17 −0 test/test-automation/build-scripts/distclean.sh
  27. +13 −0 test/test-automation/build-scripts/install-runner.sh
  28. +520 −0 test/test-automation/build-scripts/install-sh
  29. +25 −0 test/test-automation/build-scripts/install-tests.sh
  30. +8,406 −0 test/test-automation/build-scripts/ltmain.sh
  31. +376 −0 test/test-automation/build-scripts/missing
  32. +86 −0 test/test-automation/config.h.in
  33. +57 −0 test/test-automation/configure.ac
  34. BIN test/test-automation/data/images/icon.bmp
  35. +123 −0 test/test-automation/include/SDL_test.h
  36. +158 −0 test/test-automation/skeleton.xsl
  37. +23 −0 test/test-automation/src/libSDLtest/Makefile.am
  38. +183 −0 test/test-automation/src/libSDLtest/SDL_test.c
  39. +110 −0 test/test-automation/src/libSDLtest/common/common.c
  40. +43 −0 test/test-automation/src/libSDLtest/common/common.h
  41. +22 −0 test/test-automation/src/libSDLtest/common/images.h
  42. +1,456 −0 test/test-automation/src/libSDLtest/common/img_blit.c
  43. +2,691 −0 test/test-automation/src/libSDLtest/common/img_blitblend.c
  44. +197 −0 test/test-automation/src/libSDLtest/common/img_face.c
  45. +464 −0 test/test-automation/src/libSDLtest/common/img_primitives.c
  46. +646 −0 test/test-automation/src/libSDLtest/common/img_primitivesblend.c
  47. +661 −0 test/test-automation/src/libSDLtest/fuzzer/fuzzer.c
  48. +361 −0 test/test-automation/src/libSDLtest/fuzzer/fuzzer.h
  49. +125 −0 test/test-automation/src/libSDLtest/fuzzer/utl_crc32.c
  50. +113 −0 test/test-automation/src/libSDLtest/fuzzer/utl_crc32.h
  51. +314 −0 test/test-automation/src/libSDLtest/fuzzer/utl_md5.c
  52. +125 −0 test/test-automation/src/libSDLtest/fuzzer/utl_md5.h
  53. +63 −0 test/test-automation/src/libSDLtest/fuzzer/utl_random.c
  54. +112 −0 test/test-automation/src/libSDLtest/fuzzer/utl_random.h
  55. +182 −0 test/test-automation/src/libSDLtest/logger_helpers.c
  56. +40 −0 test/test-automation/src/libSDLtest/logger_helpers.h
  57. +224 −0 test/test-automation/src/libSDLtest/plain_logger.c
  58. +142 −0 test/test-automation/src/libSDLtest/plain_logger.h
  59. +376 −0 test/test-automation/src/libSDLtest/xml.c
  60. +76 −0 test/test-automation/src/libSDLtest/xml.h
  61. +674 −0 test/test-automation/src/libSDLtest/xml_logger.c
  62. +140 −0 test/test-automation/src/libSDLtest/xml_logger.h
  63. +7 −0 test/test-automation/src/runner/Makefile.am
  64. +91 −0 test/test-automation/src/runner/logger.h
  65. +1,496 −0 test/test-automation/src/runner/runner.c
  66. +75 −0 test/test-automation/src/runner/support.c
  67. +39 −0 test/test-automation/src/runner/support.h
  68. +248 −0 test/test-automation/style.xsl
  69. +4 −0 test/test-automation/tests/testaudio/Makefile.am
  70. +136 −0 test/test-automation/tests/testaudio/testaudio.c
  71. +4 −0 test/test-automation/tests/testclipboard/Makefile.am
  72. +34 −0 test/test-automation/tests/testclipboard/testclipboard.c
  73. +4 −0 test/test-automation/tests/testdummy/Makefile.am
  74. +172 −0 test/test-automation/tests/testdummy/testdummy.c
  75. +4 −0 test/test-automation/tests/testevents/Makefile.am
  76. +34 −0 test/test-automation/tests/testevents/testevents.c
  77. +4 −0 test/test-automation/tests/testkeyboard/Makefile.am
  78. +34 −0 test/test-automation/tests/testkeyboard/testkeyboard.c
  79. +4 −0 test/test-automation/tests/testplatform/Makefile.am
  80. +508 −0 test/test-automation/tests/testplatform/testplatform.c
  81. +4 −0 test/test-automation/tests/testrect/Makefile.am
  82. +137 −0 test/test-automation/tests/testrect/testrect.c
  83. +4 −0 test/test-automation/tests/testrender/Makefile.am
  84. +925 −0 test/test-automation/tests/testrender/testrender.c
  85. +4 −0 test/test-automation/tests/testrwops/Makefile.am
  86. +12 −0 test/test-automation/tests/testrwops/TestSupportRWops.h
  87. +1 −0 test/test-automation/tests/testrwops/read
  88. +285 −0 test/test-automation/tests/testrwops/testrwops.c
  89. +4 −0 test/test-automation/tests/testsurface/Makefile.am
  90. +675 −0 test/test-automation/tests/testsurface/testsurface.c
  91. +4 −0 test/test-automation/tests/testsyswm/Makefile.am
  92. +34 −0 test/test-automation/tests/testsyswm/testsyswm.c
  93. +4 −0 test/test-automation/tests/testvideo/Makefile.am
  94. +34 −0 test/test-automation/tests/testvideo/testvideo.c
@@ -1,3 +1,4 @@
/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
/*
Simple DirectMedia Layer
Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
@@ -22,27 +23,273 @@
#ifndef _SDL_config_h
#define _SDL_config_h

#include "SDL_platform.h"

/**
* \file SDL_config.h
* \file SDL_config.h.in
*
* SDL_config.h for any platform that doesn't build using the configure system.
* This is a set of defines to configure the SDL features
*/

/* Add any platform that doesn't build using the configure system. */
#if defined(__WIN32__)
#include "SDL_config_windows.h"
#elif defined(__MACOSX__)
#include "SDL_config_macosx.h"
#elif defined(__IPHONEOS__)
#include "SDL_config_iphoneos.h"
#elif defined(__ANDROID__)
#include "SDL_config_android.h"
#elif defined(__NINTENDODS__)
#include "SDL_config_nintendods.h"

/* 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 8
#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 HAVE_ALLOCA_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_STDIO_H 1
#define STDC_HEADERS 1
#define HAVE_STDLIB_H 1
#define HAVE_STDARG_H 1
/* #undef HAVE_MALLOC_H */
#define HAVE_MEMORY_H 1
#define HAVE_STRING_H 1
#define HAVE_STRINGS_H 1
#define HAVE_INTTYPES_H 1
#define HAVE_STDINT_H 1
#define HAVE_CTYPE_H 1
#define HAVE_MATH_H 1
#define HAVE_ICONV_H 1
#define HAVE_SIGNAL_H 1
/* #undef HAVE_ALTIVEC_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_STRLEN 1
#define HAVE_STRLCPY 1
#define HAVE_STRLCAT 1
#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
#define HAVE_SSCANF 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
#define HAVE_M_PI
#define HAVE_ATAN 1
#define HAVE_ATAN2 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_SIGACTION 1
#define HAVE_SETJMP 1
#define HAVE_NANOSLEEP 1
#define HAVE_SYSCONF 1
#define HAVE_SYSCTLBYNAME 1
/* #undef HAVE_CLOCK_GETTIME */
/* #undef HAVE_GETPAGESIZE */
#define HAVE_MPROTECT 1
#define HAVE_ICONV 1

#else
#include "SDL_config_minimal.h"
#endif /* platform config */
/* We may need some replacement for stdarg.h here */
#include <stdarg.h>
#endif /* HAVE_LIBC */

/* 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 */

/* Enable various audio drivers */
/* #undef SDL_AUDIO_DRIVER_ALSA */
/* #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_ARTS */
/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_BEOSAUDIO */
/* #undef SDL_AUDIO_DRIVER_BSD */
#define SDL_AUDIO_DRIVER_COREAUDIO 1
#define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1
/* #undef SDL_AUDIO_DRIVER_DSOUND */
/* #undef SDL_AUDIO_DRIVER_ESD */
/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_NAS */
/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_NDS */
/* #undef SDL_AUDIO_DRIVER_OSS */
/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
/* #undef SDL_AUDIO_DRIVER_PAUDIO */
/* #undef SDL_AUDIO_DRIVER_QSA */
/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
/* #undef SDL_AUDIO_DRIVER_WINWAVEOUT */
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */

/* Enable various input drivers */
/* #undef SDL_INPUT_LINUXEV */
/* #undef SDL_INPUT_TSLIB */
/* #undef SDL_JOYSTICK_BEOS */
/* #undef SDL_JOYSTICK_DINPUT */
/* #undef SDL_JOYSTICK_DUMMY */
#define SDL_JOYSTICK_IOKIT 1
/* #undef SDL_JOYSTICK_LINUX */
/* #undef SDL_JOYSTICK_NDS */
/* #undef SDL_JOYSTICK_WINMM */
/* #undef SDL_JOYSTICK_USBHID */
/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
/* #undef SDL_HAPTIC_DUMMY */
/* #undef SDL_HAPTIC_LINUX */
#define SDL_HAPTIC_IOKIT 1
/* #undef SDL_HAPTIC_DINPUT */

/* Enable various shared object loading systems */
/* #undef SDL_LOADSO_BEOS */
/* #undef SDL_LOADSO_DLCOMPAT */
#define SDL_LOADSO_DLOPEN 1
/* #undef SDL_LOADSO_DUMMY */
/* #undef SDL_LOADSO_LDG */
/* #undef SDL_LOADSO_WINDOWS */

/* Enable various threading systems */
/* #undef SDL_THREAD_BEOS */
/* #undef SDL_THREAD_NDS */
#define SDL_THREAD_PTHREAD 1
#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
/* #undef SDL_THREAD_SPROC */
/* #undef SDL_THREAD_WINDOWS */

/* Enable various timer systems */
/* #undef SDL_TIMER_BEOS */
/* #undef SDL_TIMER_DUMMY */
/* #undef SDL_TIMER_NDS */
#define SDL_TIMER_UNIX 1
/* #undef SDL_TIMER_WINDOWS */
/* #undef SDL_TIMER_WINCE */

/* Enable various video drivers */
/* #undef SDL_VIDEO_DRIVER_BWINDOW */
#define SDL_VIDEO_DRIVER_COCOA 1
/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
#define SDL_VIDEO_DRIVER_DUMMY 1
/* #undef SDL_VIDEO_DRIVER_NDS */
/* #undef SDL_VIDEO_DRIVER_WINDOWS */
#define SDL_VIDEO_DRIVER_X11 1
#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "/usr/X11R6/lib/libXcursor.1.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT "/usr/X11R6/lib/libXi.6.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
#define SDL_VIDEO_DRIVER_X11_XINPUT 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

/* #undef SDL_VIDEO_RENDER_D3D */
#define SDL_VIDEO_RENDER_OGL 1
/* #undef SDL_VIDEO_RENDER_OGL_ES */
/* #undef SDL_VIDEO_RENDER_DIRECTFB */

/* Enable OpenGL support */
#define SDL_VIDEO_OPENGL 1
/* #undef SDL_VIDEO_OPENGL_ES */
/* #undef SDL_VIDEO_OPENGL_BGL */
#define SDL_VIDEO_OPENGL_CGL 1
#define SDL_VIDEO_OPENGL_GLX 1
/* #undef SDL_VIDEO_OPENGL_WGL */
/* #undef SDL_VIDEO_OPENGL_OSMESA */
/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */

/* Enable system power support */
/* #undef SDL_POWER_LINUX */
/* #undef SDL_POWER_WINDOWS */
#define SDL_POWER_MACOSX 1
/* #undef SDL_POWER_BEOS */
/* #undef SDL_POWER_NINTENDODS */
/* #undef SDL_POWER_HARDWIRED */

/* Enable assembly routines */
#define SDL_ASSEMBLY_ROUTINES 1
/* #undef SDL_ALTIVEC_BLITTERS */

#endif /* _SDL_config_h */
@@ -1,2 +1,2 @@
#define SDL_REVISION "hg-0:aaaaaaaaaaah"
#define SDL_REVISION_NUMBER 0
#define SDL_REVISION "hg-5659:3f908b34b645"
#define SDL_REVISION_NUMBER 5659
@@ -55,6 +55,9 @@ SDL_SetError(const char *fmt, ...)
va_list ap;
SDL_error *error;

/* Ignore call if invalid format pointer was passed */
if (fmt == NULL) return;

/* Copy in the key, mark error as valid */
error = SDL_GetErrBuf();
error->error = 1;
@@ -1,7 +1,7 @@


CFLAGS := -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
LDFLAGS := `sdl-config --libs`
CFLAGS := -W -Wall -Wextra -g `sdl-config --prefix=/usr/local --cflags` -DSDL_NO_COMPAT
LDFLAGS := `sdl-config --prefix=/usr/local --libs`

# If it doesn't pick up defaults
#CFLAGS := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL

0 comments on commit 88605bb

Please sign in to comment.