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/os | |
| 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/os')
| -rw-r--r-- | src/os/macosx/macos.mm | 12 | ||||
| -rw-r--r-- | src/os/macosx/osx_stdafx.h | 14 |
2 files changed, 20 insertions, 6 deletions
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 <AvailabilityMacros.h> +#include "../../stdafx.h" +#include "../../core/bitmath_func.hpp" +#include "../../rev.h" +#define Rect OTTDRect +#define Point OTTDPoint #include <AppKit/AppKit.h> +#undef Rect +#undef Point #include <mach/mach.h> #include <mach/mach_host.h> #include <mach/host_info.h> #include <mach/machine.h> -#include <stdio.h> -#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 <AvailabilityMacros.h> + +/* Name conflict */ +#define Rect OTTDRect +#define Point OTTDPoint +#define WindowClass OTTDWindowClass + #include <CoreServices/CoreServices.h> +#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 |