diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 51dbabba5..042d10a93 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -1,4 +1,7 @@ #include "engine.hpp" + +#include + #include "components/esm/loadcell.hpp" #include @@ -36,7 +39,6 @@ #include "mwmechanics/mechanicsmanagerimp.hpp" -#include "SDL2/SDL.h" void OMW::Engine::executeLocalScripts() diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 20301b1b2..e096ee1fb 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -4,8 +4,8 @@ #include #include "MyGUI_UString.h" -#include "MYGUI/MyGUI_IPointer.h" -#include "MYGUI/MyGUI_ResourceImageSetPointer.h" +#include "MyGUI_IPointer.h" +#include "MyGUI_ResourceImageSetPointer.h" #include "MyGUI_TextureUtility.h" #include diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake index 614426ccc..707f5bc3d 100644 --- a/cmake/FindSDL2.cmake +++ b/cmake/FindSDL2.cmake @@ -70,6 +70,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) + FIND_PATH(SDL2_INCLUDE_DIR SDL.h HINTS $ENV{SDL2DIR} diff --git a/extern/oics/ICSPrerequisites.h b/extern/oics/ICSPrerequisites.h index 82c95c86a..2e107355a 100644 --- a/extern/oics/ICSPrerequisites.h +++ b/extern/oics/ICSPrerequisites.h @@ -39,11 +39,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tinyxml.h" -#include "SDL2/SDL_input.h" -#include "SDL2/SDL_keyboard.h" -#include "SDL2/SDL_mouse.h" -#include "SDL2/SDL_joystick.h" -#include "SDL2/SDL_events.h" +#include "SDL_input.h" +#include "SDL_keyboard.h" +#include "SDL_mouse.h" +#include "SDL_joystick.h" +#include "SDL_events.h" /// Define the dll export qualifier if compiling for Windows diff --git a/extern/sdl4ogre/OISCompat.h b/extern/sdl4ogre/OISCompat.h index 04ba2c537..3cffa143d 100644 --- a/extern/sdl4ogre/OISCompat.h +++ b/extern/sdl4ogre/OISCompat.h @@ -1,8 +1,8 @@ #ifndef _OIS_SDL_COMPAT_H #define _OIS_SDL_COMPAT_H -#include -#include +#include +#include namespace OIS { diff --git a/extern/sdl4ogre/cursormanager.hpp b/extern/sdl4ogre/cursormanager.hpp index 938f5f4c2..b98d69ce3 100644 --- a/extern/sdl4ogre/cursormanager.hpp +++ b/extern/sdl4ogre/cursormanager.hpp @@ -1,7 +1,7 @@ #ifndef _SDL4OGRE_CURSOR_MANAGER_H #define _SDL4OGRE_CURSOR_MANAGER_H -#include "SDL2/SDL_types.h" +#include #include namespace Ogre diff --git a/extern/sdl4ogre/events.h b/extern/sdl4ogre/events.h index 945daf49a..5a0146635 100644 --- a/extern/sdl4ogre/events.h +++ b/extern/sdl4ogre/events.h @@ -1,7 +1,7 @@ #ifndef _SFO_EVENTS_H #define _SFO_EVENTS_H -#include +#include //////////// diff --git a/extern/sdl4ogre/sdlcursormanager.hpp b/extern/sdl4ogre/sdlcursormanager.hpp index 2de192377..ad371f551 100644 --- a/extern/sdl4ogre/sdlcursormanager.hpp +++ b/extern/sdl4ogre/sdlcursormanager.hpp @@ -1,7 +1,7 @@ #ifndef _SDL4OGRE_CURSORMANAGER_H #define _SDL4OGRE_CURSORMANAGER_H -#include "SDL.h" +#include #include "cursormanager.hpp" #include diff --git a/extern/sdl4ogre/sdlinputwrapper.cpp b/extern/sdl4ogre/sdlinputwrapper.cpp index 0a0e321bb..da65102e7 100644 --- a/extern/sdl4ogre/sdlinputwrapper.cpp +++ b/extern/sdl4ogre/sdlinputwrapper.cpp @@ -1,5 +1,5 @@ #include "sdlinputwrapper.hpp" -#include +#include #include #include diff --git a/extern/sdl4ogre/sdlinputwrapper.hpp b/extern/sdl4ogre/sdlinputwrapper.hpp index d3c172b49..9154ff847 100644 --- a/extern/sdl4ogre/sdlinputwrapper.hpp +++ b/extern/sdl4ogre/sdlinputwrapper.hpp @@ -1,9 +1,9 @@ #ifndef _SDL4OGRE_SDLINPUTWRAPPER_H #define _SDL4OGRE_SDLINPUTWRAPPER_H -#include "SDL2/SDL_events.h" +#include -#include +#include #include #include "OISCompat.h"