*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401360
This commit is contained in:
Sam Lantinga 2006-02-10 03:19:02 +00:00
parent 5f8e63ee29
commit 3732b0b8bd
21 changed files with 22 additions and 30 deletions

View file

@ -26,7 +26,6 @@
#define _SDL_H #define _SDL_H
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_main.h"
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_rwops.h" #include "SDL_rwops.h"
#include "SDL_timer.h" #include "SDL_timer.h"

View file

@ -27,7 +27,6 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#ifndef DISABLE_EVENTS
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
@ -54,6 +53,5 @@ extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
} }
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* !DISABLE_EVENTS */
#endif /* _SDL_active_h */ #endif /* _SDL_active_h */

View file

@ -26,12 +26,10 @@
#define _SDL_audio_h #define _SDL_audio_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_main.h"
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_rwops.h" #include "SDL_rwops.h"
#include "SDL_byteorder.h" #include "SDL_endian.h"
#ifndef DISABLE_AUDIO
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
@ -249,6 +247,5 @@ extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
} }
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* !DISABLE_AUDIO */
#endif /* _SDL_audio_h */ #endif /* _SDL_audio_h */

View file

@ -27,7 +27,6 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#ifndef DISABLE_CDROM
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
@ -167,6 +166,5 @@ extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
} }
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* !DISABLE_CDROM */
#endif /* _SDL_video_h */ #endif /* _SDL_video_h */

View file

@ -28,7 +28,6 @@
#ifndef _SDL_cpuinfo_h #ifndef _SDL_cpuinfo_h
#define _SDL_cpuinfo_h #define _SDL_cpuinfo_h
#ifndef DISABLE_CPUINFO
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
@ -72,6 +71,5 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec();
} }
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* !DISABLE_CPUINFO */
#endif /* _SDL_cpuinfo_h */ #endif /* _SDL_cpuinfo_h */

View file

@ -25,6 +25,8 @@
#ifndef _SDL_error_h #ifndef _SDL_error_h
#define _SDL_error_h #define _SDL_error_h
#include "SDL_stdinc.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -25,7 +25,7 @@
#ifndef _SDL_events_h #ifndef _SDL_events_h
#define _SDL_events_h #define _SDL_events_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "SDL_active.h" #include "SDL_active.h"
#include "SDL_keyboard.h" #include "SDL_keyboard.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"

View file

@ -25,7 +25,7 @@
#ifndef _SDL_joystick_h #ifndef _SDL_joystick_h
#define _SDL_joystick_h #define _SDL_joystick_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */

View file

@ -25,7 +25,7 @@
#ifndef _SDL_keyboard_h #ifndef _SDL_keyboard_h
#define _SDL_keyboard_h #define _SDL_keyboard_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "SDL_keysym.h" #include "SDL_keysym.h"
#include "begin_code.h" #include "begin_code.h"

View file

@ -41,6 +41,8 @@
#ifndef _SDL_loadso_h #ifndef _SDL_loadso_h
#define _SDL_loadso_h #define _SDL_loadso_h
#include "SDL_stdinc.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -23,6 +23,8 @@
#ifndef _SDL_main_h #ifndef _SDL_main_h
#define _SDL_main_h #define _SDL_main_h
#include "SDL_stdinc.h"
/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
#if defined(WIN32) || defined(_WIN32) || \ #if defined(WIN32) || defined(_WIN32) || \
@ -53,9 +55,8 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);
/* From the SDL library code -- needed for registering the app on Win32 */ /* From the SDL library code -- needed for registering the app on Win32 */
#if defined(WIN32) #if defined(WIN32)
#include "SDL_types.h"
#include "begin_code.h"
#include "begin_code.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -74,8 +75,8 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp();
/* From the SDL library code -- needed for registering QuickDraw on MacOS */ /* From the SDL library code -- needed for registering QuickDraw on MacOS */
#if defined(macintosh) #if defined(macintosh)
#include "begin_code.h"
#include "begin_code.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

View file

@ -25,7 +25,7 @@
#ifndef _SDL_mouse_h #ifndef _SDL_mouse_h
#define _SDL_mouse_h #define _SDL_mouse_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "SDL_video.h" #include "SDL_video.h"
#include "begin_code.h" #include "begin_code.h"

View file

@ -28,8 +28,7 @@
These are independent of the other SDL routines. These are independent of the other SDL routines.
*/ */
#include "SDL_main.h" #include "SDL_stdinc.h"
#include "SDL_types.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */

View file

@ -25,6 +25,8 @@
#ifndef _SDL_quit_h #ifndef _SDL_quit_h
#define _SDL_quit_h #define _SDL_quit_h
#include "SDL_stdinc.h"
/* /*
An SDL_QUITEVENT is generated when the user tries to close the application An SDL_QUITEVENT is generated when the user tries to close the application
window. If it is ignored or filtered out, the window will remain open. window. If it is ignored or filtered out, the window will remain open.

View file

@ -29,7 +29,6 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#ifndef DISABLE_FILE
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
@ -129,6 +128,5 @@ extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
} }
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* !DISABLE_FILE */
#endif /* _SDL_RWops_h */ #endif /* _SDL_RWops_h */

View file

@ -25,6 +25,7 @@
#ifndef _SDL_syswm_h #ifndef _SDL_syswm_h
#define _SDL_syswm_h #define _SDL_syswm_h
#include "SDL_stdinc.h"
#include "SDL_version.h" #include "SDL_version.h"
#include "begin_code.h" #include "begin_code.h"

View file

@ -28,8 +28,7 @@
These are independent of the other SDL routines. These are independent of the other SDL routines.
*/ */
#include "SDL_main.h" #include "SDL_stdinc.h"
#include "SDL_types.h"
/* Thread synchronization primitives */ /* Thread synchronization primitives */
#include "SDL_mutex.h" #include "SDL_mutex.h"

View file

@ -25,8 +25,7 @@
/* Header for the SDL time management routines */ /* Header for the SDL time management routines */
#include "SDL_main.h" #include "SDL_stdinc.h"
#include "SDL_types.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */

View file

@ -25,7 +25,7 @@
#ifndef _SDL_version_h #ifndef _SDL_version_h
#define _SDL_version_h #define _SDL_version_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */

View file

@ -25,7 +25,7 @@
#ifndef _SDL_video_h #ifndef _SDL_video_h
#define _SDL_video_h #define _SDL_video_h
#include "SDL_types.h" #include "SDL_stdinc.h"
#include "SDL_mutex.h" #include "SDL_mutex.h"
#include "SDL_rwops.h" #include "SDL_rwops.h"

View file

@ -23,8 +23,7 @@
#ifndef _SDL_windows_h #ifndef _SDL_windows_h
#define _SDL_windows_h #define _SDL_windows_h
#include "SDL_config.h" #include "SDL_stdinc.h"
#include "SDL_types.h"
/* This includes only the windows headers needed by SDL, with no C runtime */ /* This includes only the windows headers needed by SDL, with no C runtime */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN