actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove redundant defines.

Browse Source
This commit is contained in:
Steve Checkoway
2005-10-24 08:17:12 +00:00
parent 3f93a76b21
commit cb229a8774
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* ArchHooks driver selector. */ /* ArchHooks driver selector. */
#if defined(HAVE_MACOSX) #if defined(__MACOSX__)
#include "ArchHooks_darwin.h" #include "ArchHooks_darwin.h"
#elif defined(UNIX) #elif defined(UNIX)
stepmania/src/arch/Dialog/Selector_Dialog.h
+1 -1
View File
@@ -7,7 +7,7 @@
#if defined(WIN32) #if defined(WIN32)
#include "DialogDriver_Win32.h" #include "DialogDriver_Win32.h"
#elif defined(HAVE_COCOA) #elif defined(__MACOSX__)
#include "DialogDriver_Cocoa.h" #include "DialogDriver_Cocoa.h"
#endif #endif
stepmania/src/arch/InputHandler/Selector_InputHandler.h
+1 -1
View File
@@ -17,7 +17,7 @@
// 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.
#if defined(HAVE_X11) #if defined(HAVE_X11)
#include "InputHandler_X11.h" #include "InputHandler_X11.h"
#elif defined(HAVE_CARBON) #elif defined(__MACOSX__)
#include "InputHandler_Carbon.h" #include "InputHandler_Carbon.h"
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#include "InputHandler_SDL.h" #include "InputHandler_SDL.h"
stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h
+1 -1
View File
@@ -6,7 +6,7 @@
/* LoadingWindow driver selector. */ /* LoadingWindow driver selector. */
#include "LoadingWindow_Null.h" #include "LoadingWindow_Null.h"
#if defined(HAVE_COCOA) #if defined(__MACOSX__)
#include "LoadingWindow_Cocoa.h" #include "LoadingWindow_Cocoa.h"
#elif defined(HAVE_GTK) #elif defined(HAVE_GTK)
stepmania/src/arch/Sound/Selector_RageSoundDriver.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include "RageSoundDriver_ALSA9_Software.h" #include "RageSoundDriver_ALSA9_Software.h"
#endif #endif
#ifdef HAVE_COREAUDIO #if defined(__MACOSX__)
#include "RageSoundDriver_CA.h" #include "RageSoundDriver_CA.h"
#endif #endif
stepmania/src/arch/arch_default.h
+2 -2
View File
@@ -15,8 +15,8 @@
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para" #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
#elif defined(HAVE_X11) // Prefer X11 over SDL #elif defined(HAVE_X11) // Prefer X11 over SDL
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick" #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
#elif defined(HAVE_CARBON) #elif defined(__MACOSX__)
# define DEFAULT_INPUT_DRIVER_LIST "Carbon" # define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#define DEFAULT_INPUT_DRIVER_LIST "SDL" #define DEFAULT_INPUT_DRIVER_LIST "SDL"
#elif defined(LINUX) #elif defined(LINUX)
stepmania/src/arch/arch_platform.h
-8
View File
@@ -3,14 +3,6 @@
// 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(__MACOSX__)
#define HAVE_MACOSX
#define HAVE_COCOA
#define HAVE_COREAUDIO
#define HAVE_CARBON
#define HAVE_SDL
#define HAVE_CRYPTOPP
#endif
#if defined(_WINDOWS) #if defined(_WINDOWS)
#define HAVE_DIRECTX #define HAVE_DIRECTX
#define HAVE_FFMPEG #define HAVE_FFMPEG
stepmania/src/archutils/Darwin/arch_setup.h
+9 -3
View File
@@ -2,20 +2,26 @@
#define ARCH_SETUP_DARWIN_H #define ARCH_SETUP_DARWIN_H
typedef unsigned char UInt8; typedef unsigned char UInt8;
typedef signed char SInt8;
typedef unsigned short UInt16; typedef unsigned short UInt16;
typedef signed short SInt16;
typedef unsigned long UInt32; typedef unsigned long UInt32;
typedef signed long SInt32;
typedef signed long long SInt64;
typedef unsigned long long UInt64; typedef unsigned long long UInt64;
#define __TYPES__
#define __MACTYPES__
#include <libkern/OSByteOrder.h> #include <libkern/OSByteOrder.h>
#undef __TYPES__ #undef __MACTYPES__
#define BACKTRACE_LOOKUP_METHOD_DARWIN_DYLD #define BACKTRACE_LOOKUP_METHOD_DARWIN_DYLD
#define BACKTRACE_METHOD_POWERPC_DARWIN #define BACKTRACE_METHOD_POWERPC_DARWIN
#define HAVE_VERSION_INFO #define HAVE_VERSION_INFO
#define HAVE_CXA_DEMANGLE #define HAVE_CXA_DEMANGLE
#define HAVE_CRYPTOPP
#define HAVE_THEORA
#define HAVE_FFMPEG #define HAVE_FFMPEG
#define HAVE_SDL #define HAVE_SDL
#define CRASH_HANDLER #define CRASH_HANDLER
#define HAVE_THEORA
// Looking ahead to "Universal binaries." // Looking ahead to "Universal binaries."
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
# define ENDIAN_BIG # define ENDIAN_BIG