Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 297


Ignore:
Timestamp:
Nov 28, 2007, 1:34:27 AM (16 years ago)
Author:
nicolasc
Message:

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

Location:
code/branches/merger
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/merger/CMakeLists.txt

    r296 r297  
    3131  MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
    3232  SET(CMAKE_CXX_COMPILER "g++-3.4.3")
     33
     34  SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
    3335  ENDIF(IS_TARDIS)
    3436ENDIF (UNIX)
     
    4345FIND_PACKAGE(CEGUI_OGRE)
    4446FIND_PACKAGE(ENet)
    45 # FIND_PACKAGE(Boost)
     47FIND_PACKAGE(Boost)
    4648
    4749#Sets the search paths for the linking
    48 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY})
     50LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
    4951#Sets the search path for include files
    5052#INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet)
    51 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR})
     53INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
    5254
    5355#add main source dir
  • code/branches/merger/src/network/CMakeLists.txt

    r295 r297  
    22
    33SET(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)
    4 SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h ${ENet_INCLUDE_DIR})
     4SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h)
    55
    66ADD_LIBRARY(network ${SRC_FILES} ${INC_FILES})
  • code/branches/merger/src/network/ClientConnection.cc

    r285 r297  
    132132  bool ClientConnection::disconnectConnection(){
    133133    ENetEvent event;
    134     enet_peer_disconnect(server, 0);
     134    enet_peer_disconnect(server);
     135    //enet_peer_disconnect(server, 0);
    135136    while(enet_host_service(client, &event, NETWORK_WAIT_TIMEOUT) > 0){
    136137      switch (event.type)
  • code/branches/merger/src/network/dummyclient.cc

    r285 r297  
    7171
    7272        // now disconnect
    73   enet_peer_disconnect (peer, 0);
     73  enet_peer_disconnect (peer);
     74//  enet_peer_disconnect (peer, 0);
    7475        // 3 seconds timeout
    7576  while(enet_host_service(client, &event, 3000) > 0){
Note: See TracChangeset for help on using the changeset viewer.