(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)
This commit is contained in:
bjarni
2007-02-05 21:16:56 +00:00
parent 1bf688e5b5
commit ca1a88f6c4
13 changed files with 55 additions and 99 deletions

View File

@@ -3,11 +3,6 @@
#ifndef GFX_H
#define GFX_H
/* !!! Note that the first part of this file if enclosed in extern "C" due to cocoa/obj-C !!! */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
enum WindowKeyCodes {
WKC_SHIFT = 0x8000,
@@ -175,10 +170,6 @@ void HandleExitGameRequest(void);
void GameSizeChanged(void);
void UndrawMouseCursor(void);
#ifdef __cplusplus
}; //extern "C"
/* Following part is only for C++ */
#include "helpers.hpp"
typedef enum FontSizes {
@@ -245,7 +236,7 @@ void ScreenSizeChanged(void);
void UndrawMouseCursor(void);
bool ChangeResInGame(int w, int h);
void SortResolutions(int count);
extern "C" void ToggleFullScreen(bool fs);
void ToggleFullScreen(bool fs);
/* gfx.c */
#define ASCII_LETTERSTART 32
@@ -301,6 +292,4 @@ typedef enum StringColorFlags {
extern bool _dbg_screen_rect;
#endif
#endif /* __cplusplus */
#endif /* GFX_H */