Changeset 538 for code/branches

Timestamp:

Dec 16, 2007, 1:34:51 AM (17 years ago)

Author:

landauf

Message:

windows library include (for enet)

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (7 diffs)
• src/network/dummyclient2.cc (modified) (1 diff)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -64 +64 @@
 FIND_PACKAGE(ALUT)
 FIND_PACKAGE(OggVorbis)
+FIND_PACKAGE(Zlib)
+
+IF(WIN32)
+  SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
+ENDIF(WIN32)
 
 #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} core objects loader network weapon classHierarchy audio)
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} core objects loader network weapon classHierarchy audio)
 #Sets the search path for include files
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR})
 
 #add main source dir

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

@@ -9 +9 @@
   dummyclient3.cc
 )
+
 SET( CHATSERVER_SRC_FILES
   ConnectionManager.cc
@@ -17 +18 @@
   dummyserver3.cc
 )
-
-
 
 SET( NETWORK_SRC_FILES
@@ -36 +35 @@
 
 ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
-TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
+TARGET_LINK_LIBRARIES(network ${Zlib_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
 
 ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
@@ -44 +43 @@
   core
   #objects
+  ${ENet_LIBRARY}
+  ${Zlib_LIBRARY}
+  ${WINDOWS_ENET_DEPENDENCIES}
 )
 
@@ -52 +54 @@
   core
   #objects
+  ${ENet_LIBRARY}
+  ${Zlib_LIBRARY}
+  ${WINDOWS_ENET_DEPENDENCIES}
 )
 
 ADD_EXECUTABLE(client dummyclient2.cc)
-ADD_EXECUTABLE(server dummyserver.cc)
 TARGET_LINK_LIBRARIES( client
   ${OGRE_LIBRARIES}
@@ -61 +65 @@
   core
   #objects
+  ${ENet_LIBRARY}
+  ${Zlib_LIBRARY}
+  ${WINDOWS_ENET_DEPENDENCIES}
 )
+
+ADD_EXECUTABLE(server dummyserver.cc)
 TARGET_LINK_LIBRARIES( server
   ${OGRE_LIBRARIES}
@@ -67 +76 @@
   core
   #objects
+  ${ENet_LIBRARY}
+  ${Zlib_LIBRARY}
+  ${WINDOWS_ENET_DEPENDENCIES}
 )
 

code/branches/FICN/src/network/dummyclient2.cc

@@ -36 +36 @@
 #include "PacketManager.h"
 #include "ClientConnection.h"
+
+#ifdef WIN32
+#include <windows.h>
+#define usleep(x) Sleep((x)/1000)
+#else
+#include <unistd.h>
+#endif
 
 using namespace network;

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -20 +20 @@
   xml
   orxonox
+  ${WINDOWS_ENET_DEPENDENCIES}
 )