From 0be06ec5e188c71f3affd5d99c4763a51b6b51ad Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 14 Apr 2006 04:46:47 +0000 Subject: [PATCH] Make sure code is only compiled if the appropriate subsystem is enabled --- include/SDL_config.h.in | 2 ++ src/cdrom/aix/SDL_syscdrom.c | 3 +++ src/cdrom/beos/SDL_syscdrom.cc | 3 +++ src/cdrom/bsdi/SDL_syscdrom.c | 4 ++++ src/cdrom/dc/SDL_syscdrom.c | 4 ++++ src/cdrom/dummy/SDL_syscdrom.c | 3 +++ src/cdrom/freebsd/SDL_syscdrom.c | 3 +++ src/cdrom/linux/SDL_syscdrom.c | 3 +++ src/cdrom/macos/SDL_syscdrom.c | 3 +++ src/cdrom/macosx/SDL_syscdrom.c | 3 +++ src/cdrom/mint/SDL_syscdrom.c | 4 ++++ src/cdrom/openbsd/SDL_syscdrom.c | 3 +++ src/cdrom/os2/SDL_syscdrom.c | 3 +++ src/cdrom/osf/SDL_syscdrom.c | 4 +++- src/cdrom/qnx/SDL_syscdrom.c | 4 ++++ src/cdrom/win32/SDL_syscdrom.c | 4 ++++ src/joystick/amigaos/SDL_sysjoystick.c | 4 +++- src/joystick/beos/SDL_bejoystick.cc | 4 ++++ src/joystick/bsd/SDL_sysjoystick.c | 3 +++ src/joystick/darwin/SDL_sysjoystick.c | 4 ++++ src/joystick/dc/SDL_sysjoystick.c | 4 ++++ src/joystick/dummy/SDL_sysjoystick.c | 3 +++ src/joystick/linux/SDL_sysjoystick.c | 3 +++ src/joystick/macos/SDL_sysjoystick.c | 3 +++ src/joystick/mint/SDL_sysjoystick.c | 4 ++++ src/joystick/os2/SDL_sysjoystick.c | 4 +++- src/joystick/riscos/SDL_sysjoystick.c | 3 +++ src/joystick/win32/SDL_mmjoystick.c | 4 ++++ src/loadso/beos/SDL_sysloadso.c | 3 +++ src/loadso/dlopen/SDL_sysloadso.c | 3 +++ src/loadso/dummy/SDL_sysloadso.c | 3 +++ src/loadso/macos/SDL_sysloadso.c | 3 +++ src/loadso/macosx/SDL_sysloadso.c | 3 +++ src/loadso/mint/SDL_sysloadso.c | 3 +++ src/loadso/os2/SDL_sysloadso.c | 3 +++ src/loadso/win32/SDL_sysloadso.c | 3 +++ src/thread/epoc/SDL_sysmutex.cpp | 1 + src/thread/epoc/SDL_syssem.cpp | 1 + src/thread/epoc/SDL_systhread.cpp | 1 + src/timer/amigaos/SDL_systimer.c | 4 ++++ src/timer/beos/SDL_systimer.c | 4 ++++ src/timer/dc/SDL_systimer.c | 4 ++++ src/timer/dummy/SDL_systimer.c | 4 ++++ src/timer/epoc/SDL_systimer.cpp | 5 +++++ src/timer/macos/SDL_MPWtimer.c | 4 ++++ src/timer/macos/SDL_systimer.c | 4 ++++ src/timer/mint/SDL_systimer.c | 4 ++++ src/timer/os2/SDL_systimer.c | 4 +++- src/timer/riscos/SDL_systimer.c | 4 ++++ src/timer/unix/SDL_systimer.c | 4 ++++ src/timer/win32/SDL_systimer.c | 3 +++ src/timer/wince/SDL_systimer.c | 4 ++++ src/video/epoc/SDL_epocevents.cpp | 1 + src/video/epoc/SDL_epocvideo.cpp | 3 +-- 54 files changed, 173 insertions(+), 6 deletions(-) diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index be5bc6c94..e556b2094 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -214,6 +214,7 @@ #undef SDL_LOADSO_BEOS #undef SDL_LOADSO_DLCOMPAT #undef SDL_LOADSO_DLOPEN +#undef SDL_LOADSO_DUMMY #undef SDL_LOADSO_LDG #undef SDL_LOADSO_MACOS #undef SDL_LOADSO_OS2 @@ -236,6 +237,7 @@ #undef SDL_TIMER_AMIGA #undef SDL_TIMER_BEOS #undef SDL_TIMER_DC +#undef SDL_TIMER_DUMMY #undef SDL_TIMER_EPOC #undef SDL_TIMER_MACOS #undef SDL_TIMER_MINT diff --git a/src/cdrom/aix/SDL_syscdrom.c b/src/cdrom/aix/SDL_syscdrom.c index 73a86eade..41f23a9c1 100644 --- a/src/cdrom/aix/SDL_syscdrom.c +++ b/src/cdrom/aix/SDL_syscdrom.c @@ -23,6 +23,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_AIX + /* Functions for system-level CD-ROM audio control */ /*#define DEBUG_CDROM 1*/ @@ -655,3 +657,4 @@ void SDL_SYS_CDQuit(void) } } +#endif /* SDL_CDROM_AIX */ diff --git a/src/cdrom/beos/SDL_syscdrom.cc b/src/cdrom/beos/SDL_syscdrom.cc index 5cb68e710..af9094ab7 100644 --- a/src/cdrom/beos/SDL_syscdrom.cc +++ b/src/cdrom/beos/SDL_syscdrom.cc @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_BEOS + /* Functions for system-level CD-ROM audio control on BeOS (not completely implemented yet) */ @@ -407,3 +409,4 @@ void SDL_SYS_CDQuit(void) } } +#endif /* SDL_CDROM_BEOS */ diff --git a/src/cdrom/bsdi/SDL_syscdrom.c b/src/cdrom/bsdi/SDL_syscdrom.c index 2fb405490..7687f21c4 100644 --- a/src/cdrom/bsdi/SDL_syscdrom.c +++ b/src/cdrom/bsdi/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_BSDI + /* * Functions for system-level CD-ROM audio control for BSD/OS 4.x * This started life out as a copy of the freebsd/SDL_cdrom.c file but was @@ -536,3 +538,5 @@ void SDL_SYS_CDQuit(void) } SDL_numcds = 0; } + +#endif /* SDL_CDROM_BSDI */ diff --git a/src/cdrom/dc/SDL_syscdrom.c b/src/cdrom/dc/SDL_syscdrom.c index 5c4467cd4..d89e08968 100644 --- a/src/cdrom/dc/SDL_syscdrom.c +++ b/src/cdrom/dc/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_DC + /* Functions for system-level CD-ROM audio control */ #include @@ -161,3 +163,5 @@ void SDL_SYS_CDQuit(void) { } + +#endif /* SDL_CDROM_DC */ diff --git a/src/cdrom/dummy/SDL_syscdrom.c b/src/cdrom/dummy/SDL_syscdrom.c index d5327e7b9..4a99303cc 100644 --- a/src/cdrom/dummy/SDL_syscdrom.c +++ b/src/cdrom/dummy/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if defined(SDL_CDROM_DUMMY) || defined(SDL_CDROM_DISABLED) + /* Stub functions for system-level CD-ROM audio control */ #include "SDL_cdrom.h" @@ -36,3 +38,4 @@ void SDL_SYS_CDQuit(void) return; } +#endif /* SDL_CDROM_DUMMY || SDL_CDROM_DISABLED */ diff --git a/src/cdrom/freebsd/SDL_syscdrom.c b/src/cdrom/freebsd/SDL_syscdrom.c index 0db585e50..30b5c907e 100644 --- a/src/cdrom/freebsd/SDL_syscdrom.c +++ b/src/cdrom/freebsd/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_FREEBSD + /* Functions for system-level CD-ROM audio control */ #include @@ -401,3 +403,4 @@ void SDL_SYS_CDQuit(void) } } +#endif /* SDL_CDROM_FREEBSD */ diff --git a/src/cdrom/linux/SDL_syscdrom.c b/src/cdrom/linux/SDL_syscdrom.c index 766ec581f..4d3e70cd0 100644 --- a/src/cdrom/linux/SDL_syscdrom.c +++ b/src/cdrom/linux/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_LINUX + /* Functions for system-level CD-ROM audio control */ #include /* For strerror() */ @@ -559,3 +561,4 @@ void SDL_SYS_CDQuit(void) } } +#endif /* SDL_CDROM_LINUX */ diff --git a/src/cdrom/macos/SDL_syscdrom.c b/src/cdrom/macos/SDL_syscdrom.c index ba2e201c9..bbe69e957 100644 --- a/src/cdrom/macos/SDL_syscdrom.c +++ b/src/cdrom/macos/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_MACOS + /* MacOS functions for system-level CD-ROM audio control */ #include @@ -520,3 +522,4 @@ void SDL_SYS_CDQuit(void) SDL_memset(SDL_cdlist + SDL_numcds, 0, sizeof(SDL_cdlist[0])); } +#endif /* SDL_CDROM_MACOS */ diff --git a/src/cdrom/macosx/SDL_syscdrom.c b/src/cdrom/macosx/SDL_syscdrom.c index 4fc8e4687..b63ebf63b 100644 --- a/src/cdrom/macosx/SDL_syscdrom.c +++ b/src/cdrom/macosx/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_MACOSX + #include "SDL_syscdrom_c.h" #pragma mark -- Globals -- @@ -502,3 +504,4 @@ static void SDL_SYS_CDClose(SDL_CD *cdrom) return; } +#endif /* SDL_CDROM_MACOSX */ diff --git a/src/cdrom/mint/SDL_syscdrom.c b/src/cdrom/mint/SDL_syscdrom.c index 990f2569d..c817899b0 100644 --- a/src/cdrom/mint/SDL_syscdrom.c +++ b/src/cdrom/mint/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_MINT + /* Atari MetaDOS CD-ROM functions @@ -311,3 +313,5 @@ static int SDL_SYS_CDEject(SDL_CD *cdrom) { return SDL_SYS_CDioctl(cdrom->id, CDROMEJECT, 0); } + +#endif /* SDL_CDROM_MINT */ diff --git a/src/cdrom/openbsd/SDL_syscdrom.c b/src/cdrom/openbsd/SDL_syscdrom.c index 3c332aa6f..1d77c82c4 100644 --- a/src/cdrom/openbsd/SDL_syscdrom.c +++ b/src/cdrom/openbsd/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_OPENBSD + /* Functions for system-level CD-ROM audio control */ #include @@ -410,3 +412,4 @@ void SDL_SYS_CDQuit(void) } } +#endif /* SDL_CDROM_OPENBSD */ diff --git a/src/cdrom/os2/SDL_syscdrom.c b/src/cdrom/os2/SDL_syscdrom.c index ad3c9dfb6..56205fd7f 100644 --- a/src/cdrom/os2/SDL_syscdrom.c +++ b/src/cdrom/os2/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_OS2 + /* Functions for system-level CD-ROM audio control */ #define INCL_MCIOS2 @@ -388,3 +390,4 @@ if ( SDL_numcds > 0 ) } } +#endif /* SDL_CDROM_OS2 */ diff --git a/src/cdrom/osf/SDL_syscdrom.c b/src/cdrom/osf/SDL_syscdrom.c index 9a4f5e380..8478a7b4c 100644 --- a/src/cdrom/osf/SDL_syscdrom.c +++ b/src/cdrom/osf/SDL_syscdrom.c @@ -20,6 +20,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_OSF + /* Functions for system-level CD-ROM audio control */ /* #define DEBUG_CDROM 1 */ @@ -439,4 +441,4 @@ void SDL_SYS_CDQuit(void) } } - +#endif /* SDL_CDROM_OSF */ diff --git a/src/cdrom/qnx/SDL_syscdrom.c b/src/cdrom/qnx/SDL_syscdrom.c index d64498ee7..d41d64084 100644 --- a/src/cdrom/qnx/SDL_syscdrom.c +++ b/src/cdrom/qnx/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_QNX + /* Functions for system-level CD-ROM audio control */ #include @@ -545,3 +547,5 @@ void SDL_SYS_CDQuit(void) SDL_numcds = 0; } } + +#endif /* SDL_CDROM_QNX */ diff --git a/src/cdrom/win32/SDL_syscdrom.c b/src/cdrom/win32/SDL_syscdrom.c index f9f2d270e..3d0587dad 100644 --- a/src/cdrom/win32/SDL_syscdrom.c +++ b/src/cdrom/win32/SDL_syscdrom.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_CDROM_WIN32 + /* Functions for system-level CD-ROM audio control */ #define WIN32_LEAN_AND_MEAN @@ -379,3 +381,5 @@ void SDL_SYS_CDQuit(void) SDL_numcds = 0; } } + +#endif /* SDL_CDROM_WIN32 */ diff --git a/src/joystick/amigaos/SDL_sysjoystick.c b/src/joystick/amigaos/SDL_sysjoystick.c index 7e59f9d35..35e4ebe41 100644 --- a/src/joystick/amigaos/SDL_sysjoystick.c +++ b/src/joystick/amigaos/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_AMIGA + /* This is the system specific header for the SDL joystick API */ #include @@ -225,7 +227,7 @@ void SDL_SYS_JoystickQuit(void) LowLevelBase=NULL; SDL_numjoysticks=0; } - return; } +#endif /* SDL_JOYSTICK_AMIGA */ diff --git a/src/joystick/beos/SDL_bejoystick.cc b/src/joystick/beos/SDL_bejoystick.cc index 5a020a642..7c52b8664 100644 --- a/src/joystick/beos/SDL_bejoystick.cc +++ b/src/joystick/beos/SDL_bejoystick.cc @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_BEOS + /* This is the system specific header for the SDL joystick API */ #include @@ -231,3 +233,5 @@ void SDL_SYS_JoystickQuit(void) } }; // extern "C" + +#endif /* SDL_JOYSTICK_BEOS */ diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 3846c01d3..0c7043aca 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_USBHID + /* * Joystick driver for the uhid(4) interface found in OpenBSD, * NetBSD and FreeBSD. @@ -575,3 +577,4 @@ report_free(struct report *r) r->status = SREPORT_UNINIT; } +#endif /* SDL_JOYSTICK_USBHID */ diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c index 46e786739..022c992d4 100644 --- a/src/joystick/darwin/SDL_sysjoystick.c +++ b/src/joystick/darwin/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_IOKIT + /* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */ /* Written 2001 by Max Horn */ @@ -836,3 +838,5 @@ void SDL_SYS_JoystickQuit(void) while (NULL != gpDeviceList) gpDeviceList = HIDDisposeDevice (&gpDeviceList); } + +#endif /* SDL_JOYSTICK_IOKIT */ diff --git a/src/joystick/dc/SDL_sysjoystick.c b/src/joystick/dc/SDL_sysjoystick.c index eb92f762b..ac7247334 100644 --- a/src/joystick/dc/SDL_sysjoystick.c +++ b/src/joystick/dc/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_DC + #include "SDL_events.h" #include "SDL_joystick.h" #include "../SDL_sysjoystick.h" @@ -187,3 +189,5 @@ void SDL_SYS_JoystickQuit(void) { return; } + +#endif /* SDL_JOYSTICK_DC */ diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c index 6994ef95d..f3209a2c3 100644 --- a/src/joystick/dummy/SDL_sysjoystick.c +++ b/src/joystick/dummy/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if defined(SDL_JOYSTICK_DUMMY) || defined(SDL_JOYSTICK_DISABLED) + /* This is the system specific header for the SDL joystick API */ #include "SDL_joystick.h" @@ -78,3 +80,4 @@ void SDL_SYS_JoystickQuit(void) return; } +#endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */ diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 065f50183..3d40b4977 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_LINUX + /* This is the system specific header for the SDL joystick API */ #include @@ -1195,3 +1197,4 @@ void SDL_SYS_JoystickQuit(void) SDL_joylist[0].fname = NULL; } +#endif /* SDL_JOYSTICK_LINUX */ diff --git a/src/joystick/macos/SDL_sysjoystick.c b/src/joystick/macos/SDL_sysjoystick.c index 40b4e6f50..25609b30a 100644 --- a/src/joystick/macos/SDL_sysjoystick.c +++ b/src/joystick/macos/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_MACOS + /* SDL stuff -- "SDL_sysjoystick.c" MacOS joystick functions by Frederick Reitberger @@ -315,3 +317,4 @@ void SDL_SYS_JoystickQuit(void) ISpShutdown(); } +#endif /* SDL_JOYSTICK_MACOS */ diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c index ab52ce2bf..0a129fe81 100644 --- a/src/joystick/mint/SDL_sysjoystick.c +++ b/src/joystick/mint/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_MINT + /* * Atari Joystick/Joypad drivers * @@ -627,3 +629,5 @@ static void UpdateJoypads(void) JOYPAD_IO.directions=0xff7f; jp_joypads[1] |= (((~(JOYPAD_IO.directions))>>12) & 15)<<12; } + +#endif /* SDL_JOYSTICK_MINT */ diff --git a/src/joystick/os2/SDL_sysjoystick.c b/src/joystick/os2/SDL_sysjoystick.c index c49be5c82..15dca4eb7 100644 --- a/src/joystick/os2/SDL_sysjoystick.c +++ b/src/joystick/os2/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_OS2 + /* OS/2 Joystick driver, contributed by Daniel Caetano */ #include @@ -663,4 +665,4 @@ if (*joyenv==stopchar) return chcnt; } - +#endif /* SDL_JOYSTICK_OS2 */ diff --git a/src/joystick/riscos/SDL_sysjoystick.c b/src/joystick/riscos/SDL_sysjoystick.c index 4fe7c4512..ed8ac91cb 100644 --- a/src/joystick/riscos/SDL_sysjoystick.c +++ b/src/joystick/riscos/SDL_sysjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_RISCOS + /* RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003 @@ -171,3 +173,4 @@ void SDL_SYS_JoystickQuit(void) return; } +#endif /* SDL_JOYSTICK_RISCOS */ diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/win32/SDL_mmjoystick.c index 38a8c7108..295655145 100644 --- a/src/joystick/win32/SDL_mmjoystick.c +++ b/src/joystick/win32/SDL_mmjoystick.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_JOYSTICK_WINMM + /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ #define WIN32_LEAN_AND_MEAN @@ -416,3 +418,5 @@ void SetMMerror(char *function, int code) } SDL_SetError("%s", errbuf); } + +#endif /* SDL_JOYSTICK_WINMM */ diff --git a/src/loadso/beos/SDL_sysloadso.c b/src/loadso/beos/SDL_sysloadso.c index 27892b927..cf14c0b32 100644 --- a/src/loadso/beos/SDL_sysloadso.c +++ b/src/loadso/beos/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_BEOS + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -71,3 +73,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_BEOS */ diff --git a/src/loadso/dlopen/SDL_sysloadso.c b/src/loadso/dlopen/SDL_sysloadso.c index 498745da5..ebd595500 100644 --- a/src/loadso/dlopen/SDL_sysloadso.c +++ b/src/loadso/dlopen/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_DLOPEN + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -63,3 +65,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_DLOPEN */ diff --git a/src/loadso/dummy/SDL_sysloadso.c b/src/loadso/dummy/SDL_sysloadso.c index 301ae85d5..6cd16b9a4 100644 --- a/src/loadso/dummy/SDL_sysloadso.c +++ b/src/loadso/dummy/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if defined(SDL_LOADSO_DUMMY) || defined(SDL_LOADSO_DISABLED) + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -45,3 +47,4 @@ void SDL_UnloadObject(void *handle) /* no-op. */ } +#endif /* SDL_LOADSO_DUMMY || SDL_LOADSO_DISABLED */ diff --git a/src/loadso/macos/SDL_sysloadso.c b/src/loadso/macos/SDL_sysloadso.c index 4deca7b5c..9a6df1d32 100644 --- a/src/loadso/macos/SDL_sysloadso.c +++ b/src/loadso/macos/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_MACOS + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -101,3 +103,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_MACOS */ diff --git a/src/loadso/macosx/SDL_sysloadso.c b/src/loadso/macosx/SDL_sysloadso.c index dae523f37..17516c60a 100644 --- a/src/loadso/macosx/SDL_sysloadso.c +++ b/src/loadso/macosx/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_DLCOMPAT + /* Please note that dlcompat apparently ships in current Mac OS X versions * as a system library that provides compatibility with the Unix "dlopen" * interface. In order to allow SDL to work on older OS X releases and also @@ -1399,3 +1401,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_DLCOMPAT */ diff --git a/src/loadso/mint/SDL_sysloadso.c b/src/loadso/mint/SDL_sysloadso.c index f9eacd422..d089e1b93 100644 --- a/src/loadso/mint/SDL_sysloadso.c +++ b/src/loadso/mint/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_LDG + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -57,3 +59,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_LDG */ diff --git a/src/loadso/os2/SDL_sysloadso.c b/src/loadso/os2/SDL_sysloadso.c index 0918043d4..006759103 100644 --- a/src/loadso/os2/SDL_sysloadso.c +++ b/src/loadso/os2/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_OS2 + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -66,3 +68,4 @@ void SDL_UnloadObject(void *handle) DosFreeModule((HMODULE) handle); } +#endif /* SDL_LOADSO_OS2 */ diff --git a/src/loadso/win32/SDL_sysloadso.c b/src/loadso/win32/SDL_sysloadso.c index e7d8a81ee..8ed7c68c4 100644 --- a/src/loadso/win32/SDL_sysloadso.c +++ b/src/loadso/win32/SDL_sysloadso.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_LOADSO_WIN32 + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -134,3 +136,4 @@ void SDL_UnloadObject(void *handle) } } +#endif /* SDL_LOADSO_WIN32 */ diff --git a/src/thread/epoc/SDL_sysmutex.cpp b/src/thread/epoc/SDL_sysmutex.cpp index fdbb8451b..179201261 100644 --- a/src/thread/epoc/SDL_sysmutex.cpp +++ b/src/thread/epoc/SDL_sysmutex.cpp @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_sysmutex.cpp diff --git a/src/thread/epoc/SDL_syssem.cpp b/src/thread/epoc/SDL_syssem.cpp index 65b82a13c..c3982d2df 100644 --- a/src/thread/epoc/SDL_syssem.cpp +++ b/src/thread/epoc/SDL_syssem.cpp @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_syssem.cpp diff --git a/src/thread/epoc/SDL_systhread.cpp b/src/thread/epoc/SDL_systhread.cpp index c4ebd0907..708f004dc 100644 --- a/src/thread/epoc/SDL_systhread.cpp +++ b/src/thread/epoc/SDL_systhread.cpp @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_systhread.cpp diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c index 41cf82741..a213b6142 100644 --- a/src/timer/amigaos/SDL_systimer.c +++ b/src/timer/amigaos/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_AMIGA + #include #include #include @@ -261,3 +263,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_AMIGA */ diff --git a/src/timer/beos/SDL_systimer.c b/src/timer/beos/SDL_systimer.c index e929ef34c..74ff7f6a4 100644 --- a/src/timer/beos/SDL_systimer.c +++ b/src/timer/beos/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_BEOS + #include #include "SDL_thread.h" @@ -89,3 +91,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_BEOS */ diff --git a/src/timer/dc/SDL_systimer.c b/src/timer/dc/SDL_systimer.c index e61792f39..d04a6545d 100644 --- a/src/timer/dc/SDL_systimer.c +++ b/src/timer/dc/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_DC + #include #include "SDL_thread.h" @@ -94,3 +96,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_DC */ diff --git a/src/timer/dummy/SDL_systimer.c b/src/timer/dummy/SDL_systimer.c index 51e8f74be..f4dae0357 100644 --- a/src/timer/dummy/SDL_systimer.c +++ b/src/timer/dummy/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if defined(SDL_TIMER_DUMMY) || defined(SDL_TIMERS_DISABLED) + #include "SDL_timer.h" #include "../SDL_timer_c.h" @@ -85,3 +87,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_DUMMY || SDL_TIMERS_DISABLED */ diff --git a/src/timer/epoc/SDL_systimer.cpp b/src/timer/epoc/SDL_systimer.cpp index 1abfe8483..413135c79 100644 --- a/src/timer/epoc/SDL_systimer.cpp +++ b/src/timer/epoc/SDL_systimer.cpp @@ -19,6 +19,9 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" + +#ifdef SDL_TIMER_EPOC /* SDL_systimer.cpp @@ -109,3 +112,5 @@ void SDL_SYS_StopTimer(void) } }; // extern "C" + +#endif /* SDL_TIMER_EPOC */ diff --git a/src/timer/macos/SDL_MPWtimer.c b/src/timer/macos/SDL_MPWtimer.c index cc6558f76..7aee4aa17 100644 --- a/src/timer/macos/SDL_MPWtimer.c +++ b/src/timer/macos/SDL_MPWtimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_MACOS + #include #include #include @@ -146,3 +148,5 @@ void SDL_SYS_StopTimer(void) { RmvTime((QElemPtr)&gExtendedTimerRec.tmTask); } + +#endif /* SDL_TIMER_MACOS */ diff --git a/src/timer/macos/SDL_systimer.c b/src/timer/macos/SDL_systimer.c index 762762d8c..e7ee17a4d 100644 --- a/src/timer/macos/SDL_systimer.c +++ b/src/timer/macos/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_MACOS + #include #include #include @@ -172,3 +174,5 @@ void SDL_SYS_StopTimer(void) { RmvTime((QElemPtr)&gExtendedTimerRec.tmTask); } + +#endif /* SDL_TIMER_MACOS */ diff --git a/src/timer/mint/SDL_systimer.c b/src/timer/mint/SDL_systimer.c index 4cdf01d5b..8963ca0b7 100644 --- a/src/timer/mint/SDL_systimer.c +++ b/src/timer/mint/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_MINT + /* * TOS/MiNT timer driver * based on vbl vector @@ -151,3 +153,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_MINT */ diff --git a/src/timer/os2/SDL_systimer.c b/src/timer/os2/SDL_systimer.c index 1a5f6ed9d..cba503c7f 100644 --- a/src/timer/os2/SDL_systimer.c +++ b/src/timer/os2/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_OS2 + #define INCL_DOSMISC #define INCL_DOSERRORS #define INCL_DOSSEMAPHORES @@ -222,4 +224,4 @@ void SDL_SYS_StopTimer(void) return; } - +#endif /* SDL_TIMER_OS2 */ diff --git a/src/timer/riscos/SDL_systimer.c b/src/timer/riscos/SDL_systimer.c index 4e9589a4e..b782f39ee 100644 --- a/src/timer/riscos/SDL_systimer.c +++ b/src/timer/riscos/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_RISCOS + #include #include #include @@ -227,3 +229,5 @@ void SDL_SYS_StopTimer(void) } #endif /* SDL_THREADS_DISABLED */ + +#endif /* SDL_TIMER_RISCOS */ diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c index 6501b920c..58b53ed01 100644 --- a/src/timer/unix/SDL_systimer.c +++ b/src/timer/unix/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_UNIX + #include #include #include @@ -234,3 +236,5 @@ void SDL_SYS_StopTimer(void) } #endif /* USE_ITIMER */ + +#endif /* SDL_TIMER_UNIX */ diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/win32/SDL_systimer.c index 9c4f68988..4a24d130f 100644 --- a/src/timer/win32/SDL_systimer.c +++ b/src/timer/win32/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_WIN32 + #define WIN32_LEAN_AND_MEAN #include #include @@ -155,3 +157,4 @@ void SDL_SYS_StopTimer(void) return; } +#endif /* SDL_TIMER_WIN32 */ diff --git a/src/timer/wince/SDL_systimer.c b/src/timer/wince/SDL_systimer.c index 4e9e54758..1e129db76 100644 --- a/src/timer/wince/SDL_systimer.c +++ b/src/timer/wince/SDL_systimer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#ifdef SDL_TIMER_WINCE + #define WIN32_LEAN_AND_MEAN #include #include @@ -192,3 +194,5 @@ void SDL_SYS_StopTimer(void) { return; } + +#endif /* SDL_TIMER_WINCE */ diff --git a/src/video/epoc/SDL_epocevents.cpp b/src/video/epoc/SDL_epocevents.cpp index 32fdae4da..f0e6945e3 100644 --- a/src/video/epoc/SDL_epocevents.cpp +++ b/src/video/epoc/SDL_epocevents.cpp @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_epocevents.cpp diff --git a/src/video/epoc/SDL_epocvideo.cpp b/src/video/epoc/SDL_epocvideo.cpp index 020752d21..3694f467f 100644 --- a/src/video/epoc/SDL_epocvideo.cpp +++ b/src/video/epoc/SDL_epocvideo.cpp @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_epocvideo.cpp @@ -27,8 +28,6 @@ Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi) */ - - extern "C" { #include "SDL_timer.h" #include "SDL_video.h"