From e3c7a77b4066f00f3248e390184da874bd20d7ee Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 14 Jul 2009 16:43:45 +0000 Subject: (svn r16827) -Codechange: make OSX specific files include stdafx.h always as the first file. Also unify OSX specific stuff into osx_stdafx.h and remove unused includes. --- src/music/qtmidi.cpp | 32 ++++++------------------------ src/os/macosx/macos.mm | 12 +++++++----- src/os/macosx/osx_stdafx.h | 14 +++++++++++++- src/sound/cocoa_s.cpp | 17 ++++------------ src/video/cocoa/cocoa_v.mm | 42 +++++++++++++++------------------------- src/video/cocoa/event.mm | 40 ++++++++++++++------------------------ src/video/cocoa/fullscreen.mm | 33 ++++++++++--------------------- src/video/cocoa/wnd_quartz.mm | 38 ++++++++++++------------------------ src/video/cocoa/wnd_quickdraw.mm | 40 +++++++++++++------------------------- 9 files changed, 96 insertions(+), 172 deletions(-) (limited to 'src') diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp index dce3e1033..e49e13c33 100644 --- a/src/music/qtmidi.cpp +++ b/src/music/qtmidi.cpp @@ -21,36 +21,16 @@ #ifndef NO_QUICKTIME -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include - -/* - * OpenTTD includes. - */ -#define WindowClass OSX_WindowClass -#include -#undef WindowClass - #include "../stdafx.h" #include "qtmidi.h" - -/* - * System includes. We need to workaround with some defines because there's - * stuff already defined in QuickTime headers. - */ -#define OTTD_Random OSX_OTTD_Random -#undef OTTD_Random -#undef WindowClass -#undef SL_ERROR -#undef bool - -#include -#include -#include - -/* we need to include debug.h after CoreServices because defining DEBUG will break CoreServices in OSX 10.2 */ #include "../debug.h" +#define Rect OTTDRect +#define Point OTTDPoint +#include +#undef Rect +#undef Point + static FMusicDriver_QtMidi iFMusicDriver_QtMidi; diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm index a79626026..13d826259 100644 --- a/src/os/macosx/macos.mm +++ b/src/os/macosx/macos.mm @@ -1,17 +1,19 @@ /* $Id$ */ -#include +#include "../../stdafx.h" +#include "../../core/bitmath_func.hpp" +#include "../../rev.h" +#define Rect OTTDRect +#define Point OTTDPoint #include +#undef Rect +#undef Point #include #include #include #include -#include -#include "../../stdafx.h" -#include "../../core/bitmath_func.hpp" -#include "../../rev.h" #ifndef CPU_SUBTYPE_POWERPC_970 #define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100) diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h index 9255ae3c0..ee150dd8b 100644 --- a/src/os/macosx/osx_stdafx.h +++ b/src/os/macosx/osx_stdafx.h @@ -20,15 +20,27 @@ # error "Compiling 64 bits without _SQ64 set! (or vice versa)" #endif +#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 +#include + +/* Name conflict */ +#define Rect OTTDRect +#define Point OTTDPoint +#define WindowClass OTTDWindowClass + #include +#undef Rect +#undef Point +#undef WindowClass + /* remove the variables that CoreServices defines, but we define ourselves too */ #undef bool #undef false #undef true /* Name conflict */ -#define GetTime OTTD_GetTime +#define GetTime OTTD_GetTime #define SL_ERROR OSX_SL_ERROR diff --git a/src/sound/cocoa_s.cpp b/src/sound/cocoa_s.cpp index 851136efa..f50b6bd94 100644 --- a/src/sound/cocoa_s.cpp +++ b/src/sound/cocoa_s.cpp @@ -10,27 +10,18 @@ #ifdef WITH_COCOA -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include - -#include - -/* Name conflict */ -#define Rect OTTDRect -#define Point OTTDPoint -#define WindowClass OTTDWindowClass - #include "../stdafx.h" #include "../debug.h" #include "../driver.h" #include "../mixer.h" #include "../core/endian_type.hpp" - #include "cocoa_s.h" -#undef WindowClass -#undef Point +#define Rect OTTDRect +#define Point OTTDPoint +#include #undef Rect +#undef Point static FSoundDriver_Cocoa iFSoundDriver_Cocoa; diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index f04ae8a63..8f4894c7d 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -8,13 +8,25 @@ #ifdef WITH_COCOA -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import -#import /* gettimeofday */ +#undef Rect +#undef Point + +#include "../../openttd.h" +#include "../../debug.h" +#include "../../variables.h" +#include "../../core/geometry_type.hpp" +#include "cocoa_v.h" +#include "../../blitter/factory.hpp" +#include "../../fileio_func.h" +#include "../../gfx_func.h" +#include "../../functions.h" + #import /* for MAXPATHLEN */ -#import /** * Important notice regarding all modifications!!!!!!! @@ -43,28 +55,6 @@ extern "C" OSErr CPSSetFrontProcess(CPSProcessSerNum *psn); #endif -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif - - -#include "../../stdafx.h" -#include "../../openttd.h" -#include "../../debug.h" -#include "../../variables.h" -#include "../../core/geometry_type.hpp" -#include "cocoa_v.h" -#include "../../blitter/factory.hpp" -#include "../../fileio_func.h" -#include "../../gfx_func.h" -#include "../../functions.h" - - @interface OTTDMain : NSObject @end diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index dea4eb8b5..db5f7b893 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -8,34 +8,14 @@ #ifdef WITH_COCOA -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import -#import /* gettimeofday */ -#import /* for MAXPATHLEN */ -#import - -/** - * Important notice regarding all modifications!!!!!!! - * There are certain limitations because the file is objective C++. - * gdb has limitations. - * C++ and objective C code can't be joined in all cases (classes stuff). - * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. - */ - - -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif +#undef Rect +#undef Point - -#include "../../stdafx.h" #include "../../openttd.h" #include "../../debug.h" #include "../../os/macosx/splash.h" @@ -50,6 +30,16 @@ #include "../../core/random_func.hpp" #include "../../texteff.hpp" +#import /* gettimeofday */ + +/** + * Important notice regarding all modifications!!!!!!! + * There are certain limitations because the file is objective C++. + * gdb has limitations. + * C++ and objective C code can't be joined in all cases (classes stuff). + * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. + */ + /* Right Mouse Button Emulation enum */ enum { diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm index 5cc7784ab..727e85f4d 100644 --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -8,13 +8,18 @@ #ifdef WITH_COCOA -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import -#import /* gettimeofday */ -#import /* for MAXPATHLEN */ -#import +#undef Rect +#undef Point + +#include "../../debug.h" +#include "../../core/geometry_type.hpp" +#include "cocoa_v.h" +#include "../../gfx_func.h" /** * Important notice regarding all modifications!!!!!!! @@ -29,24 +34,6 @@ extern "C" void ShowMenuBar(); extern "C" void HideMenuBar(); -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif - - -#include "../../stdafx.h" -#include "../../debug.h" -#include "../../core/geometry_type.hpp" -#include "cocoa_v.h" -#include "../../gfx_func.h" - -#undef Rect - /* Structure for rez switch gamma fades * We can hide the monitor flicker by setting the gamma tables to 0 diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index aa09db1b0..3ad0c32b9 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -9,35 +9,16 @@ #ifdef WITH_COCOA #ifdef ENABLE_COCOA_QUARTZ -#include +#include "../../stdafx.h" #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 +#define Rect OTTDRect +#define Point OTTDPoint #import -#import /* gettimeofday */ -#import /* for MAXPATHLEN */ -#import - -/** - * Important notice regarding all modifications!!!!!!! - * There are certain limitations because the file is objective C++. - * gdb has limitations. - * C++ and objective C code can't be joined in all cases (classes stuff). - * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. - */ - - -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif - +#undef Rect +#undef Point -#include "../../stdafx.h" #include "../../debug.h" #include "../../rev.h" #include "../../core/geometry_type.hpp" @@ -46,8 +27,13 @@ #include "../../gfx_func.h" #include "../../functions.h" -#undef Rect - +/** + * Important notice regarding all modifications!!!!!!! + * There are certain limitations because the file is objective C++. + * gdb has limitations. + * C++ and objective C code can't be joined in all cases (classes stuff). + * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. + */ class WindowQuartzSubdriver; diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm index ed6a4d6df..0b6434838 100644 --- a/src/video/cocoa/wnd_quickdraw.mm +++ b/src/video/cocoa/wnd_quickdraw.mm @@ -9,35 +9,15 @@ #ifdef WITH_COCOA #ifdef ENABLE_COCOA_QUICKDRAW -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 -#include +#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import -#import /* gettimeofday */ -#import /* for MAXPATHLEN */ -#import - -/** - * Important notice regarding all modifications!!!!!!! - * There are certain limitations because the file is objective C++. - * gdb has limitations. - * C++ and objective C code can't be joined in all cases (classes stuff). - * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. - */ - - -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif - +#undef Rect +#undef Point -#include "../../stdafx.h" #include "../../debug.h" #include "../../rev.h" #include "../../core/geometry_type.hpp" @@ -46,7 +26,13 @@ #include "../../gfx_func.h" #include "../../functions.h" -#undef Rect +/** + * Important notice regarding all modifications!!!!!!! + * There are certain limitations because the file is objective C++. + * gdb has limitations. + * C++ and objective C code can't be joined in all cases (classes stuff). + * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. + */ class WindowQuickdrawSubdriver; -- cgit v1.2.3-54-g00ecf