Explorar o código

Fixes includes on OSX

Paul %!s(int64=11) %!d(string=hai) anos
pai
achega
5e6383172d

+ 1 - 1
QGearsMain/include/common/QGearsApplication.h

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 #define __QGearsApplication_H__
 
 #include <OgreRoot.h>
-#include <Overlay/OgreOverlaySystem.h>
+#include <OgreOverlaySystem.h>
 
 #include "TypeDefine.h"
 

+ 1 - 1
QGearsMain/include/core/DebugDraw.h

@@ -5,7 +5,7 @@
 #include <OgreRenderQueueListener.h>
 #include <OgreRoot.h>
 #include <OgreSingleton.h>
-#include <Overlay/OgreFont.h>
+#include <OgreFont.h>
 
 
 class DebugDraw : public Ogre::RenderQueueListener, public Ogre::Singleton< DebugDraw >

+ 3 - 3
QGearsMain/src/Main.cpp

@@ -25,9 +25,9 @@
 
 #include "data/QGearsLZSFLevelFileManager.h"
 #include "common/make_unique.h"
-#include <Overlay/OgreFontManager.h>
-#include <Overlay/OgreOverlayManager.h>
-#include <Overlay/OgreOverlaySystem.h>
+#include <OgreFontManager.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlaySystem.h>
 
 #include "modules/worldmap/WorldMapModule.h"
 #include "data/worldmap/MapFileManager.h"

+ 1 - 1
QGearsMain/src/core/Console.cpp

@@ -10,7 +10,7 @@
 #include "core/ScriptManager.h"
 #include "core/Timer.h"
 #include "core/Utilites.h"
-#include <Overlay/OgreFontManager.h>
+#include <OgreFontManager.h>
 
 
 template<>Console *Ogre::Singleton< Console >::msSingleton = NULL;

+ 1 - 1
QGearsMain/src/core/DebugDraw.cpp

@@ -1,6 +1,6 @@
 #include "core/DebugDraw.h"
 
-#include <Overlay/OgreFontManager.h>
+#include <OgreFontManager.h>
 #include <OgreHardwareBufferManager.h>
 #include <OgreMaterialManager.h>
 

+ 1 - 1
QGearsMain/src/core/UiTextArea.cpp

@@ -1,6 +1,6 @@
 #include "core/UiTextArea.h"
 
-#include <Overlay/OgreFontManager.h>
+#include <OgreFontManager.h>
 #include <OgreHardwareBufferManager.h>
 #include <OgreMaterialManager.h>
 

+ 2 - 2
utilities/common/OgreBase.h

@@ -2,8 +2,8 @@
 #define __OGRE_BASE_H__
 
 #include <Ogre.h>
-#include <Overlay/OgreTextAreaOverlayElement.h>
-#include <Overlay/OgreOverlayManager.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <OgreOverlayManager.h>
 #include <OIS.h>
 
 #include "common/FileSystem.h"

+ 1 - 1
utilities/xeno_walkmesh_exporter/src/core/ui/MovableTextArea.cpp

@@ -1,7 +1,7 @@
 #include "MovableTextArea.h"
 
 #include <Ogre.h>
-#include <OGRE/Overlay/OgreOverlayManager.h>
+#include <OgreOverlayManager.h>
 
 
 MovableTextArea::MovableTextArea(const Ogre::String& name):

+ 1 - 1
utilities/xeno_walkmesh_exporter/src/game/field/Walkmesh.cpp

@@ -1,7 +1,7 @@
 // $Id$
 
 #include <Ogre.h>
-#include <OGRE/Overlay/OgreOverlayManager.h>
+#include <OgreOverlayManager.h>
 
 #include "Walkmesh.h"
 #include "../../Main.h"