Changeset 824 for code/branches

Timestamp:

Feb 17, 2008, 5:58:28 PM (17 years ago)

Author:

nicolasc

Message:

fORGE.cmake fix

Location:

code/branches/hud

Files:

• cmake/FindOGRE.cmake (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/hud/Bar.cc (modified) (2 diffs)

code/branches/hud/cmake/FindOGRE.cmake

@@ -18 +18 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OGRE")
-    SET(OGRE_INCLUDE_DIR /usr/include/OGRE ../libs/ogre/OgreMain/include)
-    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/usr/include/OGRE ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
+    SET(OGRE_INCLUDE_DIR ../libs/ogre/OgreMain/include)
+    SET(OGRE_LIB_DIR${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
 ELSE (WIN32) #Unix

code/branches/hud/src/orxonox/OrxonoxPrereqs.h

@@ -92 +92 @@
   class ParticleInterface;
   class HUD;
+  class Bar;
 }
 

code/branches/hud/src/orxonox/hud/Bar.cc

@@ -37 +37 @@
 {
   using namespace Ogre;
-    
+
   Bar::Bar(void){}
-  
+
   Bar::~Bar(void){}
-  
-  
+
+
 /*  void Bar::setPercentage(Ogre::Real percentage){
     percentage_=percentage;
@@ -57 +57 @@
 
 
-  
+
   void Bar::setColor(ColourValue color){
     color_=color;
     setColour(color);
   }
-          
-        
 
 
-
+}