diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
| commit | e3c7a77b4066f00f3248e390184da874bd20d7ee (patch) | |
| tree | 616b02702d4044f27e435ab5e0f5d826da92a171 /src/video/cocoa/cocoa_v.mm | |
| parent | 2b1c43f81f792a1aa28065c1fef4ea9cbad1f5a9 (diff) | |
| download | openttd-e3c7a77b4066f00f3248e390184da874bd20d7ee.tar.xz | |
(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.
Diffstat (limited to 'src/video/cocoa/cocoa_v.mm')
| -rw-r--r-- | src/video/cocoa/cocoa_v.mm | 42 |
1 files changed, 16 insertions, 26 deletions
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 <AvailabilityMacros.h> +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import <Cocoa/Cocoa.h> -#import <sys/time.h> /* 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 <sys/param.h> /* for MAXPATHLEN */ -#import <unistd.h> /** * 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 |