diff options
| author | bjarni <bjarni@openttd.org> | 2007-02-05 21:16:56 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-02-05 21:16:56 +0000 |
| commit | ca1a88f6c4595c2a8250f13a2a3e218558306693 (patch) | |
| tree | f736d2ea9376a1705983b456c6a998c6e7bf901c /src/video/cocoa_v.h | |
| parent | 1bf688e5b5a4d9cb509d06d0d2946cdca819f294 (diff) | |
| download | openttd-ca1a88f6c4595c2a8250f13a2a3e218558306693.tar.xz | |
(svn r8605) -Codechange: [OSX] changed all objective C to objective C++
This will permanently solve the issue where compilation on OSX broke because C++ code was added to some header files
-Note: (important if you develop mac specific code)
taken from http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html
gdb lacks an integrated C++ with Objective-C parser. This means that gdb won't be able to evaluate expressions that contain both C++ and Objective-C constructs.
gdb assumes that the language for ".mm" files is C++.
you can change it to objective C by typing: (gdb) set language objc
Mixing C++ and objective C has some limitation (see link for all of them)
Diffstat (limited to 'src/video/cocoa_v.h')
| -rw-r--r-- | src/video/cocoa_v.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/video/cocoa_v.h b/src/video/cocoa_v.h index 42e55bcca..1512a0b64 100644 --- a/src/video/cocoa_v.h +++ b/src/video/cocoa_v.h @@ -5,22 +5,9 @@ #include "../hal.h" -#ifndef __cplusplus -/* Really ugly workaround - * It should be solved right as soon as possible */ -typedef uint32 SpriteID; -#endif //__cplusplus - +#include "../openttd.h" #include "../gfx.h" -#ifdef __cplusplus -extern "C" { -#endif //__cplusplus - extern const HalVideoDriver _cocoa_video_driver; -#ifdef __cplusplus -} // extern "C" -#endif //__cplusplus - #endif |