Changeset 2639 for code/branches/buildsystem2/src/network

Timestamp:

Feb 8, 2009, 12:10:57 AM (16 years ago)

Author:

rgrieder

Message:

Cleanup in OrxonoxConfig.h.in. Made use of various CMake features like CheckInclude or CheckCompiles to determine some options and macros in the config header file.

Also removed util/Integers.h and placed the code directory in OrxonoxConfig.h.in.

Location:

code/branches/buildsystem2/src/network

Files:

• NetworkPrereqs.h (modified) (1 diff)
• Synchronisable.h (modified) (1 diff)
• packet/Packet.h (modified) (1 diff)

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

@@ -40 +40 @@
 // 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/buildsystem2/src/network/Synchronisable.h

@@ -35 +35 @@
 #include <map>
 #include <queue>
-#include "util/Integers.h"
 #include "core/OrxonoxClass.h"
 #include "core/XMLIncludes.h"
 #include "NetworkCallback.h"
-#include "util/Integers.h"
 
 #define REGISTERDATA(varname, ...) \

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

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