forked from Mirrors/openclonk
Darwin: What the hell does "#import" do anyway?
parent
1615284bd1
commit
1e1532ef8a
|
@ -36,9 +36,9 @@
|
||||||
#include "platform/StdRegistry.h"
|
#include "platform/StdRegistry.h"
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#import "C4AppDelegate.h"
|
#import "platform/C4AppDelegate.h"
|
||||||
#import "C4EditorWindowController.h"
|
#import "editor/C4EditorWindowController.h"
|
||||||
#import "C4DrawGLMac.h"
|
#import "graphics/C4DrawGLMac.h"
|
||||||
|
|
||||||
// implementation of C4Console GUI for Mac OS X
|
// implementation of C4Console GUI for Mac OS X
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
#import <AppKit/AppKit.h>
|
#import <AppKit/AppKit.h>
|
||||||
#import <Quartz/Quartz.h>
|
#import <Quartz/Quartz.h>
|
||||||
#import <C4WindowController.h>
|
#import "platform/C4WindowController.h"
|
||||||
|
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#include "game/C4Game.h"
|
#include "game/C4Game.h"
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#import <C4EditorWindowController.h>
|
#import "editor/C4EditorWindowController.h"
|
||||||
#import <C4DrawGLMac.h>
|
#import "graphics/C4DrawGLMac.h"
|
||||||
#import <C4AppDelegate.h>
|
#import "platform/C4AppDelegate.h"
|
||||||
|
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
#import "ObjectiveCAssociated.h"
|
#import "platform/ObjectiveCAssociated.h"
|
||||||
#endif
|
#endif
|
||||||
#include "graphics/C4Draw.h"
|
#include "graphics/C4Draw.h"
|
||||||
#include "graphics/C4Shader.h"
|
#include "graphics/C4Shader.h"
|
||||||
|
|
|
@ -28,9 +28,9 @@
|
||||||
|
|
||||||
#include "graphics/C4DrawGL.h"
|
#include "graphics/C4DrawGL.h"
|
||||||
|
|
||||||
#import "C4DrawGLMac.h"
|
#import "graphics/C4DrawGLMac.h"
|
||||||
#import "C4WindowController.h"
|
#import "platform/C4WindowController.h"
|
||||||
#import "C4AppDelegate+MainMenuActions.h"
|
#import "platform/C4AppDelegate+MainMenuActions.h"
|
||||||
|
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#import "C4AppDelegate.h"
|
#import "platform/C4AppDelegate.h"
|
||||||
|
|
||||||
@interface C4AppDelegate (MainMenuActions)
|
@interface C4AppDelegate (MainMenuActions)
|
||||||
- (IBAction) openScenario:(id)sender;
|
- (IBAction) openScenario:(id)sender;
|
||||||
|
|
|
@ -20,9 +20,9 @@
|
||||||
#include "game/C4Viewport.h"
|
#include "game/C4Viewport.h"
|
||||||
#include "game/C4GraphicsSystem.h"
|
#include "game/C4GraphicsSystem.h"
|
||||||
|
|
||||||
#import "C4AppDelegate+MainMenuActions.h"
|
#import "platform/C4AppDelegate+MainMenuActions.h"
|
||||||
#import "C4DrawGLMac.h"
|
#import "graphics/C4DrawGLMac.h"
|
||||||
#import "C4EditorWindowController.h"
|
#import "editor/C4EditorWindowController.h"
|
||||||
|
|
||||||
@implementation C4AppDelegate (MainMenuActions)
|
@implementation C4AppDelegate (MainMenuActions)
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
#import "C4EditorWindowController.h"
|
#import "editor/C4EditorWindowController.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@interface C4AppDelegate: NSObject
|
@interface C4AppDelegate: NSObject
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
#include "game/C4Application.h"
|
#include "game/C4Application.h"
|
||||||
#include "game/C4Game.h"
|
#include "game/C4Game.h"
|
||||||
|
|
||||||
#import "C4AppDelegate.h"
|
#import "platform/C4AppDelegate.h"
|
||||||
#import "C4AppDelegate+MainMenuActions.h"
|
#import "platform/C4AppDelegate+MainMenuActions.h"
|
||||||
#ifdef USE_SDL_MAINLOOP
|
#ifdef USE_SDL_MAINLOOP
|
||||||
#import "SDL/SDL.h"
|
#import "SDL/SDL.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
#ifndef USE_CONSOLE
|
#ifndef USE_CONSOLE
|
||||||
#import "C4WindowController.h"
|
#import "platform/C4WindowController.h"
|
||||||
#import "C4DrawGLMac.h"
|
#import "graphics/C4DrawGLMac.h"
|
||||||
|
|
||||||
bool C4AbstractApp::Copy(const StdStrBuf & text, bool fClipboard)
|
bool C4AbstractApp::Copy(const StdStrBuf & text, bool fClipboard)
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#import <CoreFoundation/CoreFoundation.h>
|
#import <CoreFoundation/CoreFoundation.h>
|
||||||
#import <CoreServices/CoreServices.h>
|
#import <CoreServices/CoreServices.h>
|
||||||
#import "ObjectiveCAssociated.h"
|
#import "platform/ObjectiveCAssociated.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class C4FileMonitor: public StdSchedulerProc, public C4InteractiveThread::Callback
|
class C4FileMonitor: public StdSchedulerProc, public C4InteractiveThread::Callback
|
||||||
|
|
|
@ -312,7 +312,7 @@ extern int MK_ALT;
|
||||||
#define K_WIN_R SDL_SCANCODE_RGUI
|
#define K_WIN_R SDL_SCANCODE_RGUI
|
||||||
#define K_PRINT SDL_SCANCODE_PRINTSCREEN
|
#define K_PRINT SDL_SCANCODE_PRINTSCREEN
|
||||||
#elif defined(USE_COCOA)
|
#elif defined(USE_COCOA)
|
||||||
#import "ObjectiveCAssociated.h"
|
#import "platform/ObjectiveCAssociated.h"
|
||||||
// FIXME
|
// FIXME
|
||||||
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers
|
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers
|
||||||
const int CocoaKeycodeOffset = 300;
|
const int CocoaKeycodeOffset = 300;
|
||||||
|
|
|
@ -22,10 +22,10 @@
|
||||||
#include "game/C4FullScreen.h"
|
#include "game/C4FullScreen.h"
|
||||||
#include "landscape/C4Landscape.h"
|
#include "landscape/C4Landscape.h"
|
||||||
|
|
||||||
#import "C4WindowController.h"
|
#import "platform/C4WindowController.h"
|
||||||
#import "C4DrawGLMac.h"
|
#import "graphics/C4DrawGLMac.h"
|
||||||
#import "C4EditorWindowController.h"
|
#import "editor/C4EditorWindowController.h"
|
||||||
#import "C4AppDelegate.h"
|
#import "platform/C4AppDelegate.h"
|
||||||
#import "AppKit/NSOpenGL.h"
|
#import "AppKit/NSOpenGL.h"
|
||||||
|
|
||||||
static SInt32 osVersion()
|
static SInt32 osVersion()
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
#include "game/C4FullScreen.h"
|
#include "game/C4FullScreen.h"
|
||||||
|
|
||||||
#import <AppKit/AppKit.h>
|
#import <AppKit/AppKit.h>
|
||||||
#import <C4WindowController.h>
|
#import "platform/C4WindowController.h"
|
||||||
#import <C4DrawGLMac.h>
|
#import "graphics/C4DrawGLMac.h"
|
||||||
|
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue