diff --git a/src/editor/C4ConsoleCocoa.mm b/src/editor/C4ConsoleCocoa.mm index 36d077bb5..274cf84e8 100644 --- a/src/editor/C4ConsoleCocoa.mm +++ b/src/editor/C4ConsoleCocoa.mm @@ -36,9 +36,9 @@ #include "platform/StdRegistry.h" #import -#import "C4AppDelegate.h" -#import "C4EditorWindowController.h" -#import "C4DrawGLMac.h" +#import "platform/C4AppDelegate.h" +#import "editor/C4EditorWindowController.h" +#import "graphics/C4DrawGLMac.h" // implementation of C4Console GUI for Mac OS X diff --git a/src/editor/C4EditorWindowController.h b/src/editor/C4EditorWindowController.h index c868d89ab..8dff45f23 100644 --- a/src/editor/C4EditorWindowController.h +++ b/src/editor/C4EditorWindowController.h @@ -15,7 +15,7 @@ #import #import -#import +#import "platform/C4WindowController.h" #ifdef USE_COCOA diff --git a/src/editor/C4EditorWindowController.mm b/src/editor/C4EditorWindowController.mm index 4231f2cff..0db41cfd8 100644 --- a/src/editor/C4EditorWindowController.mm +++ b/src/editor/C4EditorWindowController.mm @@ -22,9 +22,9 @@ #include "game/C4Game.h" #import -#import -#import -#import +#import "editor/C4EditorWindowController.h" +#import "graphics/C4DrawGLMac.h" +#import "platform/C4AppDelegate.h" #ifdef USE_COCOA diff --git a/src/graphics/C4DrawGL.h b/src/graphics/C4DrawGL.h index 95d96b20f..2fa05007a 100644 --- a/src/graphics/C4DrawGL.h +++ b/src/graphics/C4DrawGL.h @@ -27,7 +27,7 @@ #include #ifdef USE_COCOA -#import "ObjectiveCAssociated.h" +#import "platform/ObjectiveCAssociated.h" #endif #include "graphics/C4Draw.h" #include "graphics/C4Shader.h" diff --git a/src/graphics/C4DrawGLMac.mm b/src/graphics/C4DrawGLMac.mm index db5d8dd27..53899bd59 100644 --- a/src/graphics/C4DrawGLMac.mm +++ b/src/graphics/C4DrawGLMac.mm @@ -28,9 +28,9 @@ #include "graphics/C4DrawGL.h" -#import "C4DrawGLMac.h" -#import "C4WindowController.h" -#import "C4AppDelegate+MainMenuActions.h" +#import "graphics/C4DrawGLMac.h" +#import "platform/C4WindowController.h" +#import "platform/C4AppDelegate+MainMenuActions.h" #ifdef USE_COCOA diff --git a/src/platform/C4AppDelegate+MainMenuActions.h b/src/platform/C4AppDelegate+MainMenuActions.h index 9322add3d..cbb8052a8 100644 --- a/src/platform/C4AppDelegate+MainMenuActions.h +++ b/src/platform/C4AppDelegate+MainMenuActions.h @@ -14,7 +14,7 @@ */ #import -#import "C4AppDelegate.h" +#import "platform/C4AppDelegate.h" @interface C4AppDelegate (MainMenuActions) - (IBAction) openScenario:(id)sender; diff --git a/src/platform/C4AppDelegate+MainMenuActions.mm b/src/platform/C4AppDelegate+MainMenuActions.mm index 603ea9bab..081f43bf8 100644 --- a/src/platform/C4AppDelegate+MainMenuActions.mm +++ b/src/platform/C4AppDelegate+MainMenuActions.mm @@ -20,9 +20,9 @@ #include "game/C4Viewport.h" #include "game/C4GraphicsSystem.h" -#import "C4AppDelegate+MainMenuActions.h" -#import "C4DrawGLMac.h" -#import "C4EditorWindowController.h" +#import "platform/C4AppDelegate+MainMenuActions.h" +#import "graphics/C4DrawGLMac.h" +#import "editor/C4EditorWindowController.h" @implementation C4AppDelegate (MainMenuActions) diff --git a/src/platform/C4AppDelegate.h b/src/platform/C4AppDelegate.h index aeba939b4..03aa272b4 100644 --- a/src/platform/C4AppDelegate.h +++ b/src/platform/C4AppDelegate.h @@ -27,7 +27,7 @@ #import #ifdef USE_COCOA -#import "C4EditorWindowController.h" +#import "editor/C4EditorWindowController.h" #endif @interface C4AppDelegate: NSObject diff --git a/src/platform/C4AppDelegate.mm b/src/platform/C4AppDelegate.mm index b8543b093..4eec0edb3 100644 --- a/src/platform/C4AppDelegate.mm +++ b/src/platform/C4AppDelegate.mm @@ -20,8 +20,8 @@ #include "game/C4Application.h" #include "game/C4Game.h" -#import "C4AppDelegate.h" -#import "C4AppDelegate+MainMenuActions.h" +#import "platform/C4AppDelegate.h" +#import "platform/C4AppDelegate+MainMenuActions.h" #ifdef USE_SDL_MAINLOOP #import "SDL/SDL.h" #endif diff --git a/src/platform/C4AppMac.mm b/src/platform/C4AppMac.mm index 0db51a962..a00ed25a6 100644 --- a/src/platform/C4AppMac.mm +++ b/src/platform/C4AppMac.mm @@ -27,8 +27,8 @@ #import #ifndef USE_CONSOLE -#import "C4WindowController.h" -#import "C4DrawGLMac.h" +#import "platform/C4WindowController.h" +#import "graphics/C4DrawGLMac.h" bool C4AbstractApp::Copy(const StdStrBuf & text, bool fClipboard) { diff --git a/src/platform/C4FileMonitor.h b/src/platform/C4FileMonitor.h index 0ab5f522b..e74d71a82 100644 --- a/src/platform/C4FileMonitor.h +++ b/src/platform/C4FileMonitor.h @@ -26,7 +26,7 @@ #ifdef __APPLE__ #import #import -#import "ObjectiveCAssociated.h" +#import "platform/ObjectiveCAssociated.h" #endif class C4FileMonitor: public StdSchedulerProc, public C4InteractiveThread::Callback diff --git a/src/platform/C4Window.h b/src/platform/C4Window.h index 2509fc9c4..7c5c63cfd 100644 --- a/src/platform/C4Window.h +++ b/src/platform/C4Window.h @@ -312,7 +312,7 @@ extern int MK_ALT; #define K_WIN_R SDL_SCANCODE_RGUI #define K_PRINT SDL_SCANCODE_PRINTSCREEN #elif defined(USE_COCOA) -#import "ObjectiveCAssociated.h" +#import "platform/ObjectiveCAssociated.h" // FIXME // declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers const int CocoaKeycodeOffset = 300; diff --git a/src/platform/C4WindowController.mm b/src/platform/C4WindowController.mm index cda806e57..4574fba9c 100644 --- a/src/platform/C4WindowController.mm +++ b/src/platform/C4WindowController.mm @@ -22,10 +22,10 @@ #include "game/C4FullScreen.h" #include "landscape/C4Landscape.h" -#import "C4WindowController.h" -#import "C4DrawGLMac.h" -#import "C4EditorWindowController.h" -#import "C4AppDelegate.h" +#import "platform/C4WindowController.h" +#import "graphics/C4DrawGLMac.h" +#import "editor/C4EditorWindowController.h" +#import "platform/C4AppDelegate.h" #import "AppKit/NSOpenGL.h" static SInt32 osVersion() diff --git a/src/platform/C4WindowMac.mm b/src/platform/C4WindowMac.mm index 139da0737..e2cb2c1cb 100644 --- a/src/platform/C4WindowMac.mm +++ b/src/platform/C4WindowMac.mm @@ -22,8 +22,8 @@ #include "game/C4FullScreen.h" #import -#import -#import +#import "platform/C4WindowController.h" +#import "graphics/C4DrawGLMac.h" #ifdef USE_COCOA