Changeset 1195 for code/branches/input/src/orxonox

Timestamp:

Apr 27, 2008, 6:20:12 PM (17 years ago)

Author:

rgrieder

Message:

• added OIS to the orxonox src directory
• adapted VS files

Location:

code/branches/input/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (2 diffs)
• objects/SpaceShip.h (modified) (1 diff)

code/branches/input/src/orxonox/CMakeLists.txt

@@ -55 +55 @@
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
+  ois
   util
   core

code/branches/input/src/orxonox/OrxonoxStableHeaders.h

@@ -79 +79 @@
 #include <OgreWindowEventUtilities.h>
 
-#include <OIS/OIS.h>
-
 //-----------------------------------------------------------------------
 // ORXONOX HEADERS
 //-----------------------------------------------------------------------
+
+#include "ois/OIS.h"
 
 //#include "util/Convert.h"

code/branches/input/src/orxonox/objects/SpaceShip.cc

@@ -32 +32 @@
 #include <string>
 
-#include <OIS/OIS.h>
 #include <OgreCamera.h>
 #include <OgreRenderWindow.h>
@@ -38 +37 @@
 #include <OgreSceneNode.h>
 
+#include "ois/OIS.h"
 #include "util/tinyxml/tinyxml.h"
 #include "util/Convert.h"

code/branches/input/src/orxonox/objects/SpaceShip.h

@@ -33 +33 @@
 
 #include <OgrePrerequisites.h>
-#include <OIS/OISMouse.h>
 
+#include "ois/OISMouse.h"
 #include "Model.h"
 #include "../tools/BillboardSet.h"