Changeset 7990

Timestamp:

Feb 27, 2011, 5:29:19 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7952-7955 from trunk to usability in order to fix the build.

Location:

code/branches/usability

Files:

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

code/branches/usability/cmake/LibraryConfig.cmake

@@ -101 +101 @@
 IF(POCO_REQUIRED)
   FIND_PACKAGE(POCO          REQUIRED)
+  # Always link against POCO too because of threading
+  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
 ENDIF()
 IF(WIN32)

code/branches/usability/src/CMakeLists.txt

@@ -33 +33 @@
 ####### Library Behaviour (dependencies) ########
 
-# Disable Boost auto linking completely
+# Disable auto linking completely for Boost and POCO
 ADD_COMPILER_FLAGS("-DBOOST_ALL_NO_LIB")
+ADD_COMPILER_FLAGS("-DPOCO_NO_AUTOMATIC_LIBS")
 
 # If no defines are specified, these libs get linked statically

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"

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

@@ -15 +15 @@
 #include <stdlib.h>
 #include <winsock2.h>
-#include <ws2tcpip.h>
 
 typedef SOCKET ENetSocket;

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
@@ -71 +74 @@
 #include "util/mbool.h" // 11
 
-#define WIN32_LEAN_AND_MEAN
-#include <enet/enet.h> // 6, 3.1MB
-
 #endif /*ORXONOX_COMPILER_MSVC */