diff options
Diffstat (limited to 'src/video/cocoa/fullscreen.mm')
-rw-r--r-- | src/video/cocoa/fullscreen.mm | 33 |
1 files changed, 10 insertions, 23 deletions
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 <AvailabilityMacros.h> +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import <Cocoa/Cocoa.h> -#import <sys/time.h> /* gettimeofday */ -#import <sys/param.h> /* for MAXPATHLEN */ -#import <unistd.h> +#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 |