diff --git a/Engine/source/cinterface/c_controlInterface.cpp b/Engine/source/cinterface/c_controlInterface.cpp index 51bebf08d..304d3932d 100644 --- a/Engine/source/cinterface/c_controlInterface.cpp +++ b/Engine/source/cinterface/c_controlInterface.cpp @@ -36,7 +36,7 @@ extern void createFontShutdown(void); #endif #if defined(TORQUE_SDL) -#include +#include "SDL.h" #endif #if defined( TORQUE_MINIDUMP ) && defined( TORQUE_RELEASE ) diff --git a/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp b/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp index 34757ecf4..b886094c7 100644 --- a/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp +++ b/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp @@ -37,7 +37,7 @@ #include "windowManager/sdl/sdlWindow.h" #include "platform/platformGL.h" -#include +#include "SDL.h" extern void loadGLCore(); extern void loadGLExtensions(void* context); diff --git a/Engine/source/platformSDL/sdlCPUInfo.cpp b/Engine/source/platformSDL/sdlCPUInfo.cpp index dbeb52f1a..b7c480a05 100644 --- a/Engine/source/platformSDL/sdlCPUInfo.cpp +++ b/Engine/source/platformSDL/sdlCPUInfo.cpp @@ -25,7 +25,7 @@ // //----------------------------------------------------------------------------- #if defined( __FreeBSD__ ) -#include +#include "SDL.h" #include "platform/platformCPUCount.h" #include "console/console.h" diff --git a/Engine/source/platformSDL/sdlInput.cpp b/Engine/source/platformSDL/sdlInput.cpp index 72875cdf2..67d86b277 100644 --- a/Engine/source/platformSDL/sdlInput.cpp +++ b/Engine/source/platformSDL/sdlInput.cpp @@ -28,7 +28,7 @@ #include "sdlInput.h" #include "platform/platformInput.h" #include "sdlInputManager.h" -#include +#include "SDL.h" // Static class variables: InputManager* Input::smManager = NULL; diff --git a/Engine/source/platformSDL/sdlInputManager.h b/Engine/source/platformSDL/sdlInputManager.h index e7d35b66c..b9c9f057d 100644 --- a/Engine/source/platformSDL/sdlInputManager.h +++ b/Engine/source/platformSDL/sdlInputManager.h @@ -26,7 +26,7 @@ #ifndef _PLATFORMINPUT_H_ #include "platform/platformInput.h" #endif -#include +#include "SDL.h" //------------------------------------------------------------------------------ class SDLInputManager : public InputManager diff --git a/Engine/source/platformSDL/sdlMsgBox.cpp b/Engine/source/platformSDL/sdlMsgBox.cpp index 731698a99..b9466f768 100644 --- a/Engine/source/platformSDL/sdlMsgBox.cpp +++ b/Engine/source/platformSDL/sdlMsgBox.cpp @@ -1,7 +1,7 @@ #include "windowManager/platformWindowMgr.h" #include "windowManager/sdl/sdlWindow.h" -#include +#include "SDL.h" namespace { @@ -163,4 +163,4 @@ Platform::ALERT_ASSERT_RESULT Platform::AlertAssert(const char *windowTitle, con return (Platform::ALERT_ASSERT_RESULT)Platform::messageBox(windowTitle, message, MBAlertAssert ); } -#endif +#endif \ No newline at end of file diff --git a/Engine/source/windowManager/sdl/sdlCursorController.cpp b/Engine/source/windowManager/sdl/sdlCursorController.cpp index dae2d1cce..f4d8913c9 100644 --- a/Engine/source/windowManager/sdl/sdlCursorController.cpp +++ b/Engine/source/windowManager/sdl/sdlCursorController.cpp @@ -27,7 +27,7 @@ #include "windowManager/sdl/sdlCursorController.h" #include "platform/platformInput.h" -#include +#include "SDL.h" static struct { U32 id; SDL_SystemCursor resourceID; SDL_Cursor *cursor;} sgCursorShapeMap[]= { diff --git a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp index 61a64a3ad..2b241ab82 100644 --- a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp +++ b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp @@ -23,7 +23,7 @@ #include "platform/platform.h" #include "console/console.h" #include "gfx/bitmap/gBitmap.h" -#include +#include "SDL.h" #include "windowManager/sdl/sdlWindow.h" static SDL_Window* gSplashWindow = nullptr; @@ -132,4 +132,4 @@ bool Platform::closeSplashWindow() } return true; -} +} \ No newline at end of file diff --git a/Engine/source/windowManager/sdl/sdlWindow.cpp b/Engine/source/windowManager/sdl/sdlWindow.cpp index 8aca8800b..c64da01be 100644 --- a/Engine/source/windowManager/sdl/sdlWindow.cpp +++ b/Engine/source/windowManager/sdl/sdlWindow.cpp @@ -35,8 +35,8 @@ #define SDL_VIDEO_DRIVER_X11 // TODO SDL #endif -#include -#include +#include "SDL.h" +#include "SDL_syswm.h" #define SCREENSAVER_QUERY_DENY 0 // Disable screensaver diff --git a/Engine/source/windowManager/sdl/sdlWindowMgr.cpp b/Engine/source/windowManager/sdl/sdlWindowMgr.cpp index ce0f81863..dad0686d9 100644 --- a/Engine/source/windowManager/sdl/sdlWindowMgr.cpp +++ b/Engine/source/windowManager/sdl/sdlWindowMgr.cpp @@ -29,7 +29,7 @@ #include "core/strings/unicode.h" #include "gfx/bitmap/gBitmap.h" -#include +#include "SDL.h" // ------------------------------------------------------------------------