[Orxonox-commit 1069] r5790 - in sandbox_light/src/external/ogremath: GLX OSX

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-09-26 00:51:19 +0200 (Sat, 26 Sep 2009)
New Revision: 5790

Modified:
   sandbox_light/src/external/ogremath/GLX/OgreTimer.cpp
   sandbox_light/src/external/ogremath/GLX/OgreTimerImp.h
   sandbox_light/src/external/ogremath/OSX/OgreTimer.cpp
   sandbox_light/src/external/ogremath/OSX/OgreTimerImp.h
Log:
Fixed sandbox light on linux/apple

Modified: sandbox_light/src/external/ogremath/GLX/OgreTimer.cpp
===================================================================
--- sandbox_light/src/external/ogremath/GLX/OgreTimer.cpp	2009-09-25 22:44:49 UTC (rev 5789)
+++ sandbox_light/src/external/ogremath/GLX/OgreTimer.cpp	2009-09-25 22:51:19 UTC (rev 5790)
@@ -26,7 +26,7 @@
 Torus Knot Software Ltd.
 -----------------------------------------------------------------------------
 */
-#include "OgreTimer.h"
+#include "ogremath/OgreTimer.h"
 #include <sys/time.h>
 
 using namespace Ogre;

Modified: sandbox_light/src/external/ogremath/GLX/OgreTimerImp.h
===================================================================
--- sandbox_light/src/external/ogremath/GLX/OgreTimerImp.h	2009-09-25 22:44:49 UTC (rev 5789)
+++ sandbox_light/src/external/ogremath/GLX/OgreTimerImp.h	2009-09-25 22:51:19 UTC (rev 5790)
@@ -30,12 +30,12 @@
 #ifndef __GLXTimer_H__
 #define __GLXTimer_H__
 
-#include "OgrePrerequisites.h"
+#include "ogremath/OgrePrerequisites.h"
 
 namespace Ogre
 {
 	/** Timer class */
-	class _OgreExport Timer : public TimerAlloc
+	class _OgreExport Timer
 	{
 	private:
 		struct timeval start;

Modified: sandbox_light/src/external/ogremath/OSX/OgreTimer.cpp
===================================================================
--- sandbox_light/src/external/ogremath/OSX/OgreTimer.cpp	2009-09-25 22:44:49 UTC (rev 5789)
+++ sandbox_light/src/external/ogremath/OSX/OgreTimer.cpp	2009-09-25 22:51:19 UTC (rev 5790)
@@ -26,7 +26,7 @@
 Torus Knot Software Ltd.
 -----------------------------------------------------------------------------
 */
-#include "OgreTimer.h"
+#include "ogremath/OgreTimer.h"
 #include <sys/time.h>
 
 using namespace Ogre;

Modified: sandbox_light/src/external/ogremath/OSX/OgreTimerImp.h
===================================================================
--- sandbox_light/src/external/ogremath/OSX/OgreTimerImp.h	2009-09-25 22:44:49 UTC (rev 5789)
+++ sandbox_light/src/external/ogremath/OSX/OgreTimerImp.h	2009-09-25 22:51:19 UTC (rev 5790)
@@ -30,12 +30,12 @@
 #ifndef __OSXTimer_H__
 #define __OSXTimer_H__
 
-#include <Ogre/OgrePrerequisites.h>
+#include <ogremath/OgrePrerequisites.h>
 
 namespace Ogre
 {
 	/** Timer class */
-	class Timer : public TimerAlloc
+	class Timer
 	{
 	private:
 		struct timeval start;