Yes, Darwin (and OS X) is POSIX, see

http://www.xyroth-enterprises.co.uk/posixos.htm
SDL is used on OS X for some things, but not all.
Use #if defined(...) instead of #ifdef in most of the Selector_*.h files.
This commit is contained in:
Steve Checkoway
2005-03-23 21:15:12 +00:00
parent ae02033893
commit 47de0f1783
6 changed files with 19 additions and 28 deletions
@@ -7,7 +7,7 @@
#if defined(HAVE_DARWIN) #if defined(HAVE_DARWIN)
#include "ArchHooks_darwin.h" #include "ArchHooks_darwin.h"
#elif defined(HAVE_POSIX) #elif defined(HAVE_UNIX)
#include "ArchHooks_Unix.h" #include "ArchHooks_Unix.h"
#elif defined(HAVE_WIN32) // XXX: Better name for this API? #elif defined(HAVE_WIN32) // XXX: Better name for this API?
+2 -3
View File
@@ -4,11 +4,10 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* Dialog drivers selector. */ /* Dialog drivers selector. */
#ifdef HAVE_WIN32 #if defined(HAVE_WIN32)
#include "DialogDriver_Win32.h" #include "DialogDriver_Win32.h"
#endif
#ifdef HAVE_COCOA #elif defined(HAVE_COCOA)
#include "DialogDriver_Cocoa.h" #include "DialogDriver_Cocoa.h"
#endif #endif
@@ -17,9 +17,9 @@
#include "InputHandler_MonkeyKeyboard.h" #include "InputHandler_MonkeyKeyboard.h"
// NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on. // NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on.
#ifdef HAVE_X11 #if defined(HAVE_X11)
#include "InputHandler_X11.h" #include "InputHandler_X11.h"
#elif HAVE_SDL #elif defined(HAVE_SDL)
#include "InputHandler_SDL.h" #include "InputHandler_SDL.h"
#endif #endif
@@ -4,25 +4,21 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* LoadingWindow driver selector. */ /* LoadingWindow driver selector. */
#ifdef HAVE_COCOA
#include "LoadingWindow_Cocoa.h"
#endif
#ifdef HAVE_GTK
#include "LoadingWindow_Gtk.h"
#endif
#include "LoadingWindow_Null.h" #include "LoadingWindow_Null.h"
#ifdef HAVE_SDL #if defined(HAVE_COCOA)
#include "LoadingWindow_Cocoa.h"
#elif defined(HAVE_GTK)
#include "LoadingWindow_Gtk.h"
#elif defined(HAVE_SDL)
#include "LoadingWindow_SDL.h" #include "LoadingWindow_SDL.h"
#endif
#ifdef HAVE_WIN32 #elif defined(HAVE_WIN32)
#include "LoadingWindow_Win32.h" #include "LoadingWindow_Win32.h"
#endif
#ifdef HAVE_XBOX #elif defined(HAVE_XBOX)
#include "LoadingWindow_Xbox.h" #include "LoadingWindow_Xbox.h"
#endif #endif
@@ -24,10 +24,6 @@
#include "RageSoundDriver_OSS.h" #include "RageSoundDriver_OSS.h"
#endif #endif
#ifdef HAVE_QUICKTIME1
#include "RageSoundDriver_QT1.h"
#endif
#ifdef HAVE_WIN32 #ifdef HAVE_WIN32
#include "RageSoundDriver_WaveOut.h" #include "RageSoundDriver_WaveOut.h"
#endif #endif
+4 -4
View File
@@ -3,14 +3,14 @@
// In here, you define which APIs are guaranteed to be available on which OSes. // In here, you define which APIs are guaranteed to be available on which OSes.
// Don't ever actually #include anything here -- that's for */Selector_*.h. // Don't ever actually #include anything here -- that's for */Selector_*.h.
#if defined(UNIX) && !defined(DARWIN) // Darwin isn't POSIX enough for us. #if defined(UNIX) && !defined(DARWIN)
#define HAVE_POSIX // (is Darwin POSIX at all?) #define HAVE_UNIX
#endif #endif
#if defined(DARWIN) #if defined(DARWIN)
#define HAVE_DARWIN #define HAVE_DARWIN
#define HAVE_COCOA #define HAVE_COCOA
#define HAVE_COREAUDIO #define HAVE_COREAUDIO
#define HAVE_QUICKTIME1 #define HAVE_SDL
#endif #endif
#if defined(_WINDOWS) #if defined(_WINDOWS)
#define HAVE_DIRECTX #define HAVE_DIRECTX
@@ -21,7 +21,7 @@
#define HAVE_XBOX // XXX: Better name for this API? #define HAVE_XBOX // XXX: Better name for this API?
#endif #endif
#if defined(LINUX) #if defined(LINUX)
#define HAVE_POSIX // Here just to be explicit. #define HAVE_UNIX // Here just to be explicit.
#define HAVE_LINUXKERNEL #define HAVE_LINUXKERNEL
#endif #endif