(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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user