Changeset 301 for code/branches/merger

Timestamp:

Nov 28, 2007, 2:26:29 AM (17 years ago)

Author:

nicolasc

Message:

2nd tier cleanup

Location:

code/branches/merger

Files:

• CMakeLists.txt (modified) (1 diff)
• src/class_hierarchy/CMakeLists.txt (modified) (1 diff)
• src/loader/CMakeLists.txt (modified) (1 diff)
• src/main.cc (deleted)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/weapon/CMakeLists.txt (modified) (1 diff)

code/branches/merger/CMakeLists.txt

@@ -51 +51 @@
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy)
 #Sets the search path for include files
-INCLUDE_DIRECTORIES(src ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
 
 #add main source dir

code/branches/merger/src/class_hierarchy/CMakeLists.txt

@@ -15 +15 @@
    )
 
-ADD_LIBRARY(CLASS_HIERARCHY ${CLASS_HIERARCHY_SRC} )
+ADD_LIBRARY(classHierarchy ${CLASS_HIERARCHY_SRC} )

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

@@ -5 +5 @@
 SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
 
+INCLUDE_DIRECTORIES(..)
+
 ADD_LIBRARY(loader ${SRC_FILES} ${INC_FILES})

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

@@ -7 +7 @@
 ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} ${Boost_LIBRARIES} core objects loader network)
+TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} ${Boost_LIBRARIES} loader)
 
+INCLUDE_DIRECTORIES(..)
 
 ADD_SUBDIRECTORY(core)

code/branches/merger/src/weapon/CMakeLists.txt

@@ -11 +11 @@
 )
 
-ADD_LIBRARY(WEAPON ${WEAPON_SRC} )
+INCLUDE_DIRECTORIES(..)
+
+ADD_LIBRARY(weapon ${WEAPON_SRC})