Changeset 2664 for code/branches/buildsystem3/src/network

Timestamp:

Feb 14, 2009, 10:53:45 PM (15 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/network/CMakeLists.txt (modified) (2 diffs)
• src/network/Makefile.norm (deleted)
• src/network/Makefile.tardis (deleted)
• src/network/Makefile.test (deleted)
• src/network/NetworkPrereqs.h (modified) (1 diff)
• src/network/packet/CMakeLists.txt (modified) (2 diffs)
• src/network/packet/Packet.cc (modified) (1 diff)
• src/network/packet/Packet.h (modified) (1 diff)

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

@@ -1 @@
-SET( NETWORK_SRC_FILES
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+
+SET_SOURCE_FILES(NETWORK_SRC_FILES
   ChatListener.cc
   Client.cc
@@ -14 +33 @@
   Host.cc
 )
+ADD_SUBDIRECTORY(packet)
+GET_ALL_HEADER_FILES(NETWORK_HDR_FILES)
+SET(NETWORK_FILES ${NETWORK_SRC_FILES} ${NETWORK_HDR_FILES})
 
-ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES packet)
+GENERATE_SOURCE_GROUPS(${NETWORK_FILES})
 ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES synchronisable)
 
-
-IF(WIN32)
-  ADD_LIBRARY( network ${NETWORK_SRC_FILES} )
-ELSE(WIN32)
-  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES} )
-ENDIF(WIN32)
-
-TARGET_LINK_LIBRARIES( network
+ADD_LIBRARY(network SHARED ${NETWORK_FILES})
+SET_TARGET_PROPERTIES(network PROPERTIES DEFINE_SYMBOL "NETWORK_SHARED_BUILD")
+TARGET_LINK_LIBRARIES(network
   ${ZLIB_LIBRARY}
-  ${ENet_LIBRARY}
-  ${Boost_thread_LIBRARIES}
+  ${ENET_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
+  util
   core
 )
 
+ORXONOX_INSTALL(network)
 
 # build those parts only on request.
 IF(NETWORK_TESTING_ENABLED)
   ##### test for gamestate stuff #####
-  SET( TEST_SRC_FILES
+  SET(TEST_SRC_FILES
     ${NETWORK_SRC_FILES}
   )
   ADD_EXECUTABLE(networktest ${TEST_SRC_FILES})
-  TARGET_LINK_LIBRARIES( networktest
-    ${OGRE_LIBRARIES}
+  TARGET_LINK_LIBRARIES(networktest
+    ${OGRE_LIBRARY}
     network
-    ${ENet_LIBRARY}
+    ${ENET_LIBRARY}
     ${ZLIB_LIBRARY}
-    ${WINDOWS_ENET_DEPENDENCIES}
   )
   ##### end test for gamestate stuff #####

code/branches/buildsystem3/src/network/NetworkPrereqs.h

@@ -35 +35 @@
 #define _NetworkPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------
 // Shared library settings
 //-----------------------------------------------------------------------
-#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !defined( NETWORK_STATIC_BUILD )
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( NETWORK_STATIC_BUILD )
 #  ifdef NETWORK_SHARED_BUILD
 #    define _NetworkExport __declspec(dllexport)

code/branches/buildsystem3/src/network/packet/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(NETWORK_SRC_FILES
   Packet.cc
   Chat.cc
@@ -8 +8 @@
   DeleteObjects.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/network/packet/Packet.cc

@@ -167 +167 @@
   assert(ClientInformation::findClient(&peer->address)->getID() != (unsigned int)-2 || !Host::isServer());
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
-  Packet *p;
+  Packet *p = 0;
   COUT(5) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
   switch( *(ENUM::Type *)(data + _PACKETID) )

code/branches/buildsystem3/src/network/packet/Packet.h

@@ -34 +34 @@
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>
-
-#include "util/Integers.h"
 
 namespace orxonox {