Changeset 3196 for code/trunk/src/network
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 1 deleted
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/network/CMakeLists.txt
r3084 r3196 37 37 ADD_SUBDIRECTORY(packet) 38 38 ADD_SUBDIRECTORY(synchronisable) 39 GET_ALL_HEADER_FILES(NETWORK_HDR_FILES)40 SET(NETWORK_FILES ${NETWORK_SRC_FILES} ${NETWORK_HDR_FILES})41 39 42 GENERATE_SOURCE_GROUPS(${NETWORK_FILES}) 43 44 ADD_LIBRARY(network SHARED ${NETWORK_FILES}) 45 SET_TARGET_PROPERTIES(network PROPERTIES DEFINE_SYMBOL "NETWORK_SHARED_BUILD") 46 TARGET_LINK_LIBRARIES(network 47 ${ZLIB_LIBRARY} 48 ${ENET_LIBRARY} 49 ${Boost_THREAD_LIBRARY} 50 util 51 core 40 ORXONOX_ADD_LIBRARY(network 41 FIND_HEADER_FILES 42 DEFINE_SYMBOL 43 "NETWORK_SHARED_BUILD" 44 PCH_FILE 45 NetworkPrecompiledHeaders.h 46 LINK_LIBRARIES 47 ${ZLIB_LIBRARY} 48 ${ENET_LIBRARY} 49 ${Boost_THREAD_LIBRARY} 50 util 51 core 52 SOURCE_FILES 53 ${NETWORK_SRC_FILES} 52 54 ) 53 54 ORXONOX_INSTALL(network) -
code/trunk/src/network/GamestateClient.cc
r3102 r3196 34 34 #include "core/CoreIncludes.h" 35 35 #include "core/BaseObject.h" 36 #include "core/Iterator.h"37 36 #include "synchronisable/Synchronisable.h" 38 37 #include "synchronisable/NetworkCallbackManager.h" -
code/trunk/src/network/Host.h
r3084 r3196 36 36 namespace orxonox { 37 37 38 const int CLIENTID_SERVER = 0;38 const unsigned int CLIENTID_SERVER = 0; 39 39 const unsigned int NETWORK_FREQUENCY = 30; 40 40 const float NETWORK_PERIOD = 1.0f/NETWORK_FREQUENCY; -
code/trunk/src/network/NetworkFunction.h
r3084 r3196 36 36 #include <map> 37 37 #include <cassert> 38 #include <boost/preprocessor/cat.hpp> 38 39 #include "util/MultiType.h" 40 #include "core/Functor.h" 39 41 #include "synchronisable/Synchronisable.h" 40 42 #include "OrxonoxConfig.h" … … 214 216 215 217 #define registerStaticNetworkFunction( functionPointer ) \ 216 static void* MACRO_CONCATENATE( NETWORK_FUNCTION_, __LINE__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer );218 static void* BOOST_PP_CAT( NETWORK_FUNCTION_, __LINE__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer ); 217 219 #define registerMemberNetworkFunction( class, function ) \ 218 static void* MACRO_CONCATENATE( NETWORK_FUNCTION_##class, __LINE__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function);220 static void* BOOST_PP_CAT( NETWORK_FUNCTION_##class, __LINE__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function); 219 221 // call it with functionPointer, clientID, args 220 222 #define callStaticNetworkFunction( functionPointer, ...) \ -
code/trunk/src/network/Server.cc
r3102 r3196 54 54 #include "core/ConsoleCommand.h" 55 55 #include "core/CoreIncludes.h" 56 #include "core/Iterator.h"57 56 #include "packet/Chat.h" 58 57 #include "packet/Packet.h" -
code/trunk/src/network/packet/Gamestate.cc
r3084 r3196 36 36 #include "core/GameMode.h" 37 37 #include "core/CoreIncludes.h" 38 #include "core/Iterator.h"39 38 40 39
Note: See TracChangeset
for help on using the changeset viewer.