Changeset 539 for code/branches/FICN/src

Timestamp:

Dec 16, 2007, 2:04:21 AM (17 years ago)

Author:

nicolasc

Message:

• standardized FindZLIB.cmake
• minor cleanup in Media

Location:

code/branches/FICN/src

Files:

• network/CMakeLists.txt (modified) (3 diffs)
• orxonox/orxonox.cc (modified) (1 diff)

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

@@ -35 +35 @@
 
 ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
-TARGET_LINK_LIBRARIES(network ${Zlib_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
+TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
 
 ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
@@ -44 +44 @@
   #objects
   ${ENet_LIBRARY}
-  ${Zlib_LIBRARY}
+  ${ZLIB_LIBRARY}
   ${WINDOWS_ENET_DEPENDENCIES}
 )
@@ -55 +55 @@
   #objects
   ${ENet_LIBRARY}
-  ${Zlib_LIBRARY}
+  ${ZLIB_LIBRARY}
   ${WINDOWS_ENET_DEPENDENCIES}
 )

code/branches/FICN/src/orxonox/orxonox.cc

@@ -67 +67 @@
 #include "../network/Client.h"
 #include "../network/NetworkFrameListener.h"
-
-// some tests to see if enet works without includsion
-//#include <enet/enet.h>
-//#include <enet/protocol.h>