Changeset 774

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

Files:

• bin/main.bat (deleted)
• bin/orxonox.bat (added)
• bin/run-script (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/audio/AudioIncludes.h (modified) (1 diff)
• src/audio/AudioManager.cc (modified) (1 diff)
• src/loader/LevelLoader.cc (modified) (1 diff)
• src/network/Client.h (modified) (1 diff)
• src/network/ConnectionManager.h (modified) (1 diff)
• src/network/GameStateClient.h (modified) (1 diff)
• src/network/GameStateManager.h (modified) (1 diff)
• src/network/Synchronisable.cc (modified) (1 diff)
• src/network/Synchronisable.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Ambient.h (modified) (1 diff)
• src/orxonox/objects/Camera.h (modified) (1 diff)
• src/orxonox/objects/Skybox.h (modified) (1 diff)
• src/orxonox/objects/Test.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/orxonox/objects/test1.h (modified) (1 diff)
• src/orxonox/objects/test2.h (modified) (1 diff)
• src/orxonox/objects/test3.h (modified) (1 diff)
• src/orxonox/objects/weapon/AmmunitionDump.h (modified) (1 diff)
• src/orxonox/objects/weapon/BulletManager.h (modified) (1 diff)
• src/util/String2Number.h (modified) (1 diff)

code/branches/FICN/bin/run-script

@@ -1 +1 @@
 #!/bin/bash
 
-if [[ !  -f main ]] ; then
-        echo "main does not exist"
+if [[ !  -f orxonox ]] ; then
+        echo "orxonox does not exist"
         echo "did you compile it?"
 
@@ -22 +22 @@
         fi
 fi
-exec ./main $@
+exec ./orxonox $@

code/branches/FICN/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
+INCLUDE_DIRECTORIES(orxonox)
 
 ADD_SUBDIRECTORY(util)

code/branches/FICN/src/audio/AudioIncludes.h

@@ -11 +11 @@
 #include <vorbis/vorbisfile.h>
 
-#include "orxonox/core/Error.h"
+#include "core/Error.h"

code/branches/FICN/src/audio/AudioManager.cc

@@ -27 +27 @@
 
 #include "AudioManager.h"
-#include "orxonox/core/Debug.h"
+#include "core/Debug.h"
 
 namespace audio

code/branches/FICN/src/loader/LevelLoader.cc

@@ -29 +29 @@
 #include <OgreOverlayManager.h>
 
-#include "orxonox/core/Error.h"
-#include "orxonox/core/Debug.h"
-#include "orxonox/core/CoreIncludes.h"
+#include "core/Error.h"
+#include "core/Debug.h"
+#include "core/CoreIncludes.h"
 
 #include "audio/AudioManager.h"
-#include "orxonox/core/BaseObject.h"
+#include "core/BaseObject.h"
 #include "orxonox/Orxonox.h"
 

code/branches/FICN/src/network/Client.h

@@ -19 +19 @@
 #include "PacketManager.h"
 #include "GameStateClient.h"
-#include "orxonox/core/CoreIncludes.h"
+#include "core/CoreIncludes.h"
 //#include "NetworkFrameListener.h"
 

code/branches/FICN/src/network/ConnectionManager.h

@@ -24 +24 @@
 #include "PacketBuffer.h"
 #include "PacketManager.h"
-#include "orxonox/core/CoreIncludes.h"
+#include "core/CoreIncludes.h"
 
 namespace std{

code/branches/FICN/src/network/GameStateClient.h

@@ -15 +15 @@
 #include "zlib.h"
 #include "Synchronisable.h"
-#include "orxonox/core/CoreIncludes.h"
-#include "orxonox/core/BaseObject.h"
+#include "core/CoreIncludes.h"
+#include "core/BaseObject.h"
 #include "GameStateManager.h"
 

code/branches/FICN/src/network/GameStateManager.h

@@ -19 +19 @@
 #include "ClientInformation.h"
 #include "Synchronisable.h"
-#include "orxonox/core/CoreIncludes.h"
-#include "orxonox/core/Iterator.h"
+#include "core/CoreIncludes.h"
+#include "core/Iterator.h"
 #include "PacketTypes.h"
 

code/branches/FICN/src/network/Synchronisable.cc

@@ -11 +11 @@
 
 #include "Synchronisable.h"
-#include "orxonox/core/CoreIncludes.h"
+#include "core/CoreIncludes.h"
 
 

code/branches/FICN/src/network/Synchronisable.h

@@ -17 +17 @@
 #include <string>
 
-#include "orxonox/core/CoreIncludes.h"
-#include "orxonox/core/OrxonoxClass.h"
+#include "core/CoreIncludes.h"
+#include "core/OrxonoxClass.h"
 
 namespace network {

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"
 

code/branches/FICN/src/util/String2Number.h

@@ -6 +6 @@
 #include <iostream>
 
-#include "orxonox/core/Debug.h"
+#include "core/Debug.h"
 
 /**