Changeset 283 for code/branches

Timestamp:

Nov 27, 2007, 11:19:44 PM (17 years ago)

Author:

rgrieder

Message:

• removed the loader files due to several compiler errors (not needed in this branch anyway)
• added a suitable CMake concept for subfolders (in this case just the one)
• hud not yet implemented in orxonox.cc (however it is in main_reto branch)

Location:

code/branches/hud

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/hud/CMakeLists.txt (added)
• src/loader (deleted)
• src/network (deleted)
• src/orxonox.cc (modified) (2 diffs)
• src/xml (deleted)

code/branches/hud/CMakeLists.txt

@@ -45 +45 @@
 #Sets the search paths for the linking
 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
+
 #Sets the search path for include files
 #INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet)
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+        src
+        ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
+        )
 
 #add main source dir

code/branches/hud/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-
-SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h)
+SET( ORXONOX_SRC
+        orxonox.cc
+)
 
 #Creates an executable
-ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
+ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} )
+
+#add weapon source dir
+ADD_SUBDIRECTORY(hud)
+
 #Links the executable against OGRE and OIS
-TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
-
+TARGET_LINK_LIBRARIES(../bin/main
+        HUD
+        ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES}
+)

code/branches/hud/src/orxonox.cc

@@ -39 +39 @@
 #include <iostream>
 
-#include "xml/xmlParser.h"
-#include "loader/LevelLoader.h"
+#include "hud/hud_overlay.h"
 
 
@@ -191 +190 @@
     {
 
-      string levelFile = "sp_level_moonstation.oxw";
-      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }