Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 30, 2007, 10:14:48 PM (17 years ago)
Author:
nicolasc
Message:
  • added copyrightnotice to spaceshipsteeringobject
  • added OPTION to build networktools
  • minor cleanups
Location:
code/branches/FICN/src/network
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r659 r732  
    11PROJECT(Orxonox)
    2 
    3 SET( CHATCLIENT_SRC_FILES
    4   ClientConnection.cc
    5   Client.cc
    6   PacketBuffer.cc
    7   PacketDecoder.cc
    8   PacketGenerator.cc
    9   dummyclient3.cc
    10 )
    11 
    12 SET( CHATSERVER_SRC_FILES
    13   ConnectionManager.cc
    14   GameStateManager.cc
    15   PacketBuffer.cc
    16   PacketDecoder.cc
    17   PacketGenerator.cc
    18   dummyserver3.cc
    19 )
    202
    213SET( NETWORK_SRC_FILES
    … …  
    4224TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
    4325
    44 # chatserver for testing purposes
    45 ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
    46 TARGET_LINK_LIBRARIES( chatserver
    47   ${OGRE_LIBRARIES}
    48   network
    49   core
    50   #objects
    51   ${ENet_LIBRARY}
    52   ${ZLIB_LIBRARY}
    53   ${WINDOWS_ENET_DEPENDENCIES}
    54 )
     26# build those parts only on request.
     27IF(NETWORK_TESTING_ENABLED)
     28  SET( CHATCLIENT_SRC_FILES
     29    ClientConnection.cc
     30    Client.cc
     31    PacketBuffer.cc
     32    PacketDecoder.cc
     33    PacketGenerator.cc
     34    dummyclient3.cc
     35  )
    5536
    56 # chatclient for testing purpose
    57 ADD_EXECUTABLE(chatclient ${CHATCLIENT_SRC_FILES})
    58 TARGET_LINK_LIBRARIES( chatclient
    59   ${OGRE_LIBRARIES}
    60   network
    61   core
    62   #objects
    63   ${ENet_LIBRARY}
    64   ${ZLIB_LIBRARY}
    65   ${WINDOWS_ENET_DEPENDENCIES}
    66 )
     37  SET( CHATSERVER_SRC_FILES
     38    ConnectionManager.cc
     39    GameStateManager.cc
     40    PacketBuffer.cc
     41    PacketDecoder.cc
     42    PacketGenerator.cc
     43    dummyserver3.cc
     44  )
    6745
    68 # client for testing purpose
    69 ADD_EXECUTABLE(client dummyclient2.cc)
    70 TARGET_LINK_LIBRARIES( client
    71   ${OGRE_LIBRARIES}
    72   network
    73   core
    74   #objects
    75   ${ENet_LIBRARY}
    76   ${ZLIB_LIBRARY}
    77   ${WINDOWS_ENET_DEPENDENCIES}
    78 )
     46  # chatserver for testing purposes
     47  ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
     48  TARGET_LINK_LIBRARIES( chatserver
     49    ${OGRE_LIBRARIES}
     50    network
     51    core
     52    #objects
     53    ${ENet_LIBRARY}
     54    ${ZLIB_LIBRARY}
     55    ${WINDOWS_ENET_DEPENDENCIES}
     56  )
    7957
    80 # server for testing purpose
    81 ADD_EXECUTABLE(server dummyserver.cc)
    82 TARGET_LINK_LIBRARIES( server
    83   ${OGRE_LIBRARIES}
    84   network
    85   core
    86   #objects
    87   ${ENet_LIBRARY}
    88   ${ZLIB_LIBRARY}
    89   ${WINDOWS_ENET_DEPENDENCIES}
    90 )
     58  # chatclient for testing purpose
     59  ADD_EXECUTABLE(chatclient ${CHATCLIENT_SRC_FILES})
     60  TARGET_LINK_LIBRARIES( chatclient
     61    ${OGRE_LIBRARIES}
     62    network
     63    core
     64    #objects
     65    ${ENet_LIBRARY}
     66    ${ZLIB_LIBRARY}
     67    ${WINDOWS_ENET_DEPENDENCIES}
     68  )
    9169
     70  # client for testing purpose
     71  ADD_EXECUTABLE(client dummyclient2.cc)
     72  TARGET_LINK_LIBRARIES( client
     73    ${OGRE_LIBRARIES}
     74    network
     75    core
     76    #objects
     77    ${ENet_LIBRARY}
     78    ${ZLIB_LIBRARY}
     79    ${WINDOWS_ENET_DEPENDENCIES}
     80  )
     81
     82  # server for testing purpose
     83  ADD_EXECUTABLE(server dummyserver.cc)
     84  TARGET_LINK_LIBRARIES( server
     85    ${OGRE_LIBRARIES}
     86    network
     87    core
     88    #objects
     89    ${ENet_LIBRARY}
     90    ${ZLIB_LIBRARY}
     91    ${WINDOWS_ENET_DEPENDENCIES}
     92  )
     93ENDIF(NETWORK_TESTING_ENABLED)

  • code/branches/FICN/src/network/GameStateClient.h

    r673 r732  
    22// C++ Interface: GameStateClient
    33//
    4 // Description: 
     4// Description:
    55//
    66//
    … …  
    2121namespace network {
    2222
    23 /**
    24         @author
    25 */
    2623class GameStateClient{
    2724public:
    … …  
    3633  GameState decode(GameStateCompressed x);
    3734  void removeObject(orxonox::Iterator<Synchronisable> &it);
    38  
     35
    3936  GameState reference;
    4037};
Note: See TracChangeset for help on using the changeset viewer.