Changeset 297 for code/branches/merger

Timestamp:

Nov 28, 2007, 1:34:27 AM (17 years ago)

Author:

nicolasc

Message:

made enet and boost working on tardis; needed some minor changes in source code

Location:

code/branches/merger

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/network/CMakeLists.txt (modified) (1 diff)
• src/network/ClientConnection.cc (modified) (1 diff)
• src/network/dummyclient.cc (modified) (1 diff)

code/branches/merger/CMakeLists.txt

@@ -31 +31 @@
   MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
   SET(CMAKE_CXX_COMPILER "g++-3.4.3")
+
+  SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
   ENDIF(IS_TARDIS)
 ENDIF (UNIX)
@@ -43 +45 @@
 FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
-# FIND_PACKAGE(Boost)
+FIND_PACKAGE(Boost)
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY})
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
 #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} ${ENet_INCLUDE_DIR})
+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/network/CMakeLists.txt

@@ -2 +2 @@
 
 SET(SRC_FILES Client.cc ConnectionManager.cc PacketBuffer.cc PacketGenerator.cc Synchronisable.cc dummyclient2.cc ClientConnection.cc GameStateManager.cc PacketDecoder.cc Server.cc dummyclient.cc dummyserver.cc)
-SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h ${ENet_INCLUDE_DIR})
+SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h)
 
 ADD_LIBRARY(network ${SRC_FILES} ${INC_FILES})

code/branches/merger/src/network/ClientConnection.cc

@@ -132 +132 @@
   bool ClientConnection::disconnectConnection(){
     ENetEvent event;
-    enet_peer_disconnect(server, 0);
+    enet_peer_disconnect(server);
+    //enet_peer_disconnect(server, 0);
     while(enet_host_service(client, &event, NETWORK_WAIT_TIMEOUT) > 0){
       switch (event.type)

code/branches/merger/src/network/dummyclient.cc

@@ -71 +71 @@
 
         // now disconnect
-  enet_peer_disconnect (peer, 0);
+  enet_peer_disconnect (peer);
+//  enet_peer_disconnect (peer, 0);
         // 3 seconds timeout
   while(enet_host_service(client, &event, 3000) > 0){