Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
More header massaging... works great on Windows. ;-)
  • Loading branch information
slouken committed Feb 10, 2006
1 parent 9c4a626 commit 63f4244
Show file tree
Hide file tree
Showing 268 changed files with 90 additions and 806 deletions.
14 changes: 8 additions & 6 deletions include/SDL.h
Expand Up @@ -26,16 +26,18 @@
#define _SDL_H

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_timer.h"
#include "SDL_audio.h"
#include "SDL_cdrom.h"
#include "SDL_joystick.h"
#include "SDL_cpuinfo.h"
#include "SDL_endian.h"
#include "SDL_error.h"
#include "SDL_events.h"
#include "SDL_video.h"
#include "SDL_loadso.h"
#include "SDL_byteorder.h"
#include "SDL_mutex.h"
#include "SDL_rwops.h"
#include "SDL_thread.h"
#include "SDL_timer.h"
#include "SDL_video.h"
#include "SDL_version.h"

#include "begin_code.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_active.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_active_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
4 changes: 3 additions & 1 deletion include/SDL_audio.h
Expand Up @@ -27,8 +27,10 @@

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_endian.h"
#include "SDL_mutex.h"
#include "SDL_thread.h"
#include "SDL_rwops.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
1 change: 1 addition & 0 deletions include/SDL_cdrom.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_cdrom_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
115 changes: 10 additions & 105 deletions include/SDL_config.h
@@ -1,4 +1,3 @@
/* include/SDL_config.h. Generated by configure. */
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2006 Sam Lantinga
Expand All @@ -24,111 +23,17 @@
#ifndef _SDL_config_h
#define _SDL_config_h

/* This is a set of defines to configure the SDL features */
/* This is the minimal configuration that can be used to build SDL */

/* C language features */
/* #undef const */
/* #undef inline */
/* #undef volatile */
#include <stdarg.h>

/* C datatypes */
/* #undef size_t */
/* #undef int8_t */
/* #undef uint8_t */
/* #undef int16_t */
/* #undef uint16_t */
/* #undef int32_t */
/* #undef uint32_t */
#define SDL_HAS_64BIT_TYPE 1
/* #undef int64_t */
/* #undef uint64_t */
/* #undef uintptr_t */

/* Endianness */
#define SDL_BYTEORDER 1234

/* Comment this if you want to build without any C library requirements */
#define HAVE_LIBC 1
#ifdef HAVE_LIBC

/* Useful headers */
#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
#define HAVE_MALLOC_H 1
#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_SIGNAL_H 1

/* 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_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_STRCPY 1
#define HAVE_STRNCPY 1
#define HAVE_STRCAT 1
#define HAVE_STRNCAT 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
/* #undef HAVE__I64TOA */
/* #undef HAVE__UI64TOA */
#define HAVE_STRTOLL 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
#define HAVE_SSCANF 1
#define HAVE_SNPRINTF 1
/* #undef HAVE_VSNPRINTF */

#endif /* HAVE_LIBC */


/* Allow disabling of core subsystems */
/* #undef DISABLE_AUDIO */
/* #undef DISABLE_VIDEO */
/* #undef DISABLE_EVENTS */
/* #undef DISABLE_JOYSTICK */
/* #undef DISABLE_CDROM */
/* #undef DISABLE_THREADS */
/* #undef DISABLE_TIMERS */
/* #undef DISABLE_FILE */
/* #undef DISABLE_CPUINFO */
typedef signed char int8_t;
typedef unsigned char uint8_t;
typedef signed short int16_t;
typedef unsigned short uint16_t;
typedef signed int int32_t;
typedef unsigned int uint32_t;
typedef unsigned int size_t;
typedef unsigned long uintptr_t;

#endif /* _SDL_config_h */
1 change: 1 addition & 0 deletions include/SDL_events.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_events_h

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_active.h"
#include "SDL_keyboard.h"
#include "SDL_mouse.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_joystick.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_joystick_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
1 change: 1 addition & 0 deletions include/SDL_keyboard.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_keyboard_h

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_keysym.h"

#include "begin_code.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_loadso.h
Expand Up @@ -42,6 +42,7 @@
#define _SDL_loadso_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
1 change: 1 addition & 0 deletions include/SDL_mouse.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_mouse_h

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_video.h"

#include "begin_code.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_mutex.h
Expand Up @@ -29,6 +29,7 @@
*/

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
1 change: 1 addition & 0 deletions include/SDL_quit.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_quit_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

/*
An SDL_QUITEVENT is generated when the user tries to close the application
Expand Down
1 change: 1 addition & 0 deletions include/SDL_rwops.h
Expand Up @@ -28,6 +28,7 @@
#define _SDL_RWops_h

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
23 changes: 0 additions & 23 deletions include/SDL_stdlib.h

This file was deleted.

23 changes: 0 additions & 23 deletions include/SDL_string.h

This file was deleted.

1 change: 1 addition & 0 deletions include/SDL_syswm.h
Expand Up @@ -26,6 +26,7 @@
#define _SDL_syswm_h

#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_version.h"

#include "begin_code.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_thread.h
Expand Up @@ -29,6 +29,7 @@
*/

#include "SDL_stdinc.h"
#include "SDL_error.h"

/* Thread synchronization primitives */
#include "SDL_mutex.h"
Expand Down
1 change: 1 addition & 0 deletions include/SDL_timer.h
Expand Up @@ -26,6 +26,7 @@
/* Header for the SDL time management routines */

#include "SDL_stdinc.h"
#include "SDL_error.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_video.h
Expand Up @@ -26,7 +26,7 @@
#define _SDL_video_h

#include "SDL_stdinc.h"
#include "SDL_mutex.h"
#include "SDL_error.h"
#include "SDL_rwops.h"

#include "begin_code.h"
Expand Down
2 changes: 0 additions & 2 deletions src/SDL.c
Expand Up @@ -27,8 +27,6 @@
#endif

#include "SDL.h"
#include "SDL_stdlib.h"
#include "SDL_endian.h"
#include "SDL_fatal.h"
#ifndef DISABLE_VIDEO
#include "SDL_leaks.h"
Expand Down
3 changes: 0 additions & 3 deletions src/SDL_error.c
Expand Up @@ -22,9 +22,6 @@

/* Simple error handling in SDL */

#include "SDL_stdlib.h"
#include "SDL_string.h"
#include "SDL_types.h"
#include "SDL_error.h"
#include "SDL_error_c.h"
#ifndef DISABLE_THREADS
Expand Down
4 changes: 0 additions & 4 deletions src/audio/SDL_audio.c
Expand Up @@ -23,10 +23,6 @@
/* Allow access to a raw mixing buffer */

#include "SDL.h"
#include "SDL_audio.h"
#include "SDL_timer.h"
#include "SDL_error.h"
#include "SDL_string.h"
#include "SDL_audio_c.h"
#include "SDL_audiomem.h"
#include "SDL_sysaudio.h"
Expand Down
1 change: 0 additions & 1 deletion src/audio/SDL_audiocvt.c
Expand Up @@ -22,7 +22,6 @@

/* Functions for audio drivers to perform runtime conversion of audio format */

#include "SDL_error.h"
#include "SDL_audio.h"


Expand Down
6 changes: 2 additions & 4 deletions src/audio/SDL_audiodev.c
Expand Up @@ -28,8 +28,7 @@
#include <sys/types.h>
#include <sys/stat.h>

#include "SDL_stdlib.h"
#include "SDL_string.h"
#include "SDL_stdinc.h"
#include "SDL_audiodev_c.h"

#ifndef _PATH_DEV_DSP
Expand Down Expand Up @@ -103,8 +102,7 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic)
#include <sys/types.h>
#include <sys/stat.h>

#include "SDL_stdlib.h"
#include "SDL_string.h"
#include "SDL_stdinc.h"
#include "SDL_audiodev_c.h"

#ifndef _PATH_DEV_DSP
Expand Down
2 changes: 1 addition & 1 deletion src/audio/SDL_audiomem.c
Expand Up @@ -31,7 +31,7 @@
#include <stddef.h>
#endif

#include "SDL_stdlib.h"
#include "SDL_stdinc.h"
#include "SDL_audiomem.h"

/* Allocate memory that will be shared between threads (freed on exit) */
Expand Down

0 comments on commit 63f4244

Please sign in to comment.