(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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user