Changeset 293 for code

Timestamp:

Nov 28, 2007, 12:59:55 AM (17 years ago)

Author:

nicolasc

Message:

added FindENet and FindBoost
FindBoost does not work (yet)

Location:

code/branches/merger

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/hud/hud_overlay.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/merger/CMakeLists.txt

@@ -42 +42 @@
 FIND_PACKAGE(CEGUI)
 FIND_PACKAGE(CEGUI_OGRE)
+FIND_PACKAGE(ENet)
+# FIND_PACKAGE(Boost)
 
 #Sets the search paths for the linking

code/branches/merger/src/CMakeLists.txt

@@ -13 +13 @@
 ADD_SUBDIRECTORY(loader)
 ADD_SUBDIRECTORY(network)
+ADD_SUBDIRECTORY(hud)

code/branches/merger/src/hud/hud_overlay.h

@@ -33 +33 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
-
 
 namespace orxonox {

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} core objects loader network)
+TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} ${Boost_LIBRARIES} core objects loader network)