Changeset 774 for code/branches/FICN/src/orxonox

Timestamp:

Dec 31, 2007, 4:56:53 PM (17 years ago)

Author:

rgrieder

Message:

• changed executable from main to orxonox
• added src/orxonox to the include directories

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/Ambient.h (modified) (1 diff)
• objects/Camera.h (modified) (1 diff)
• objects/Skybox.h (modified) (1 diff)
• objects/Test.h (modified) (1 diff)
• objects/WorldEntity.h (modified) (1 diff)
• objects/test1.h (modified) (1 diff)
• objects/test2.h (modified) (1 diff)
• objects/test3.h (modified) (1 diff)
• objects/weapon/AmmunitionDump.h (modified) (1 diff)
• objects/weapon/BulletManager.h (modified) (1 diff)

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

@@ -31 +31 @@
 )
 
-ADD_EXECUTABLE( main ${ORXONOX_SRC_FILES} )
+ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 
-SET_TARGET_PROPERTIES( main PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( orxonox PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( main
+TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}

code/branches/FICN/src/orxonox/objects/Ambient.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/Camera.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/Skybox.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 
 class TiXmlElement; // Forward declaration

code/branches/FICN/src/orxonox/objects/Test.h

@@ -29 +29 @@
 #define _Test_H__
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "../core/CoreIncludes.h"
 

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -11 +11 @@
 #include "util/tinyxml/tinyxml.h"
 #include "../core/CoreIncludes.h"
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "Tickable.h"
 #include "../tools/Mesh.h"

code/branches/FICN/src/orxonox/objects/test1.h

@@ -2 +2 @@
 #define _Test1_H__
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "Tickable.h"
 #include "test3.h"

code/branches/FICN/src/orxonox/objects/test2.h

@@ -2 +2 @@
 #define _Test2_H__
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "../tools/Timer.h"
 

code/branches/FICN/src/orxonox/objects/test3.h

@@ -2 +2 @@
 #define _Test3_H__
 
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -38 +38 @@
 #include "network/Synchronisable.h"
 //#include "../core/CoreIncludes.h"
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 
 

code/branches/FICN/src/orxonox/objects/weapon/BulletManager.h

@@ -39 +39 @@
 #include "util/tinyxml/tinyxml.h"
 #include "../../core/CoreIncludes.h"
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "../Tickable.h"