fix includes for Windows

apps/openmw/engine.cpp

@@ -1,4 +1,7 @@
 #include "engine.hpp"
+
+#include <SDL.h>
+
 #include "components/esm/loadcell.hpp"
 
 #include <OgreRoot.h>
@@ -36,7 +39,6 @@
 
 #include "mwmechanics/mechanicsmanagerimp.hpp"
 
-#include "SDL2/SDL.h"
 
 
 void OMW::Engine::executeLocalScripts()

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -4,8 +4,8 @@
 #include <iterator>
 
 #include "MyGUI_UString.h"
-#include "MYGUI/MyGUI_IPointer.h"
+#include "MyGUI_IPointer.h"
-#include "MYGUI/MyGUI_ResourceImageSetPointer.h"
+#include "MyGUI_ResourceImageSetPointer.h"
 #include "MyGUI_TextureUtility.h"
 
 #include <openengine/ogre/renderer.hpp>

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}

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 "SDL_input.h"
-#include "SDL2/SDL_keyboard.h"
+#include "SDL_keyboard.h"
-#include "SDL2/SDL_mouse.h"
+#include "SDL_mouse.h"
-#include "SDL2/SDL_joystick.h"
+#include "SDL_joystick.h"
-#include "SDL2/SDL_events.h"
+#include "SDL_events.h"
 
 /// Define the dll export qualifier if compiling for Windows
 

extern/sdl4ogre/OISCompat.h

@@ -1,8 +1,8 @@
 #ifndef _OIS_SDL_COMPAT_H
 #define _OIS_SDL_COMPAT_H
 
-#include <SDL2/SDL_events.h>
+#include <SDL_events.h>
-#include <SDL2/SDL_types.h>
+#include <SDL_types.h>
 
 namespace OIS
 {

extern/sdl4ogre/cursormanager.hpp

@@ -1,7 +1,7 @@
 #ifndef _SDL4OGRE_CURSOR_MANAGER_H
 #define _SDL4OGRE_CURSOR_MANAGER_H
 
-#include "SDL2/SDL_types.h"
+#include <SDL_types.h>
 #include <string>
 
 namespace Ogre

extern/sdl4ogre/events.h

@@ -1,7 +1,7 @@
 #ifndef _SFO_EVENTS_H
 #define _SFO_EVENTS_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 
 ////////////

extern/sdl4ogre/sdlcursormanager.hpp

@@ -1,7 +1,7 @@
 #ifndef _SDL4OGRE_CURSORMANAGER_H
 #define _SDL4OGRE_CURSORMANAGER_H
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "cursormanager.hpp"
 #include <map>

extern/sdl4ogre/sdlinputwrapper.cpp

@@ -1,5 +1,5 @@
 #include "sdlinputwrapper.hpp"
-#include <SDL2/SDL_syswm.h>
+#include <SDL_syswm.h>
 
 #include <OgrePlatform.h>
 #include <OgreRoot.h>

extern/sdl4ogre/sdlinputwrapper.hpp

@@ -1,9 +1,9 @@
 #ifndef _SDL4OGRE_SDLINPUTWRAPPER_H
 #define _SDL4OGRE_SDLINPUTWRAPPER_H
 
-#include "SDL2/SDL_events.h"
+#include <SDL_events.h>
 
-#include <OGRE/OgreRenderWindow.h>
+#include <OgreRenderWindow.h>
 #include <boost/unordered_map.hpp>
 
 #include "OISCompat.h"