Changeset 7991 for code/branches/usability

Timestamp:

Feb 27, 2011, 5:32:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7975-7977 from kicklib to usability in order to fix the build.

Location:

code/branches/usability

Files:

• . (modified) (1 prop)
• src/external/enet/win32.c (modified) (1 diff)
• src/libraries/network/NetworkPrecompiledHeaders.h (modified) (2 diffs)

code/branches/usability/src/external/enet/win32.c

@@ -8 +8 @@
 
 #include <time.h>
-#include <ws2tcpip.h>
 #define ENET_BUILDING_LIB 1
 #include "enet/enet.h"
+#include <ws2tcpip.h>
 
 static enet_uint32 timeBase = 0;

code/branches/usability/src/libraries/network/NetworkPrecompiledHeaders.h

@@ -62 +62 @@
 #include <cmath>    // 15
 
-#define WIN32_LEAN_AND_MEAN
-#include <enet/enet.h> // 6, 3.1MB
-
 #include <OgreMath.h>        // 15
 #include <OgreVector2.h>     // 15
@@ -74 +71 @@
 #include "util/mbool.h" // 11
 
+#define WIN32_LEAN_AND_MEAN
+#include <enet/enet.h> // 6, 3.1MB
+
 #endif /*ORXONOX_COMPILER_MSVC */