mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

fix includes for Windows

Browse source
This commit is contained in:
Jordan Milne 2013-01-12 17:52:26 -04:00
parent eb08f407d3
commit b6ec64485c
10 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

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

4
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -4,8 +4,8 @@
#include <iterator> #include <iterator>
#include "MyGUI_UString.h" #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 "MyGUI_TextureUtility.h"
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>

1
cmake/FindSDL2.cmake
View file

@ -70,6 +70,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
FIND_PATH(SDL2_INCLUDE_DIR SDL.h FIND_PATH(SDL2_INCLUDE_DIR SDL.h
HINTS HINTS
$ENV{SDL2DIR} $ENV{SDL2DIR}

10
extern/oics/ICSPrerequisites.h vendored
View file

@ -39,11 +39,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tinyxml.h" #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 /// Define the dll export qualifier if compiling for Windows

4
extern/sdl4ogre/OISCompat.h vendored
View file

@ -1,8 +1,8 @@
#ifndef _OIS_SDL_COMPAT_H #ifndef _OIS_SDL_COMPAT_H
#define _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 namespace OIS
{ {

2
extern/sdl4ogre/cursormanager.hpp vendored
View file

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

2
extern/sdl4ogre/events.h vendored
View file

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

2
extern/sdl4ogre/sdlcursormanager.hpp vendored
View file

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

2
extern/sdl4ogre/sdlinputwrapper.cpp vendored
View file

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

4
extern/sdl4ogre/sdlinputwrapper.hpp vendored
View file

@ -1,9 +1,9 @@
#ifndef _SDL4OGRE_SDLINPUTWRAPPER_H #ifndef _SDL4OGRE_SDLINPUTWRAPPER_H
#define _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 <boost/unordered_map.hpp>
#include "OISCompat.h" #include "OISCompat.h"