Changeset 341 for code/branches/FICN/src/loader

Timestamp:

Nov 28, 2007, 9:54:59 PM (17 years ago)

Author:

rgrieder

Message:

• removed folder src/class_hierarchy
• removed a few unnec. files in src/
• added a few files in src/orxonox to make weapon system and hud work
• restructured all CMLs
• adjusted all the #include directives (only one include directory now: src)
• moved ENET library linkage to CML in src/orxonox

Location:

code/branches/FICN/src/loader

Files:

• CMakeLists.txt (modified) (1 diff)
• LevelLoader.cc (modified) (1 diff)
• LevelLoader.h (modified) (1 diff)
• Light.cc (modified) (1 diff)
• Light.h (modified) (1 diff)
• LightManager.cc (modified) (1 diff)
• LightManager.h (modified) (1 diff)

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

@@ -2 +2 @@
 
 # TODO find a cleaner way to include xmlParser
-SET(SRC_FILES LevelLoader.cc ../xml/xmlParser.cc)
-# SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
+SET( LOADER_SRC_FILES
+        LevelLoader.cc
+        ../xml/xmlParser.cc
+)
 
-INCLUDE_DIRECTORIES(..)
-
-ADD_LIBRARY(loader ${SRC_FILES} ${INC_FILES})
+ADD_LIBRARY(loader ${LOADER_SRC_FILES})

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

@@ -3 +3 @@
 
 #include "LevelLoader.h"
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 
 using namespace std;

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

@@ -9 +9 @@
 #include <iostream>
 
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 
 #ifndef __MODULE_LEVELLOADER__

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

@@ -1 +1 @@
 
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 #include "Light.h"
 

code/branches/FICN/src/loader/Light.h

@@ -1 +1 @@
 
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 
 #ifndef __MODULE_LIGHT__

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

@@ -1 +1 @@
 
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 #include "LightManager.h"
 

code/branches/FICN/src/loader/LightManager.h

@@ -1 +1 @@
 #include <vector>
 
-#include "../xml/xmlParser.h"
+#include "xml/xmlParser.h"
 #include "Light.h"