[Orxonox-commit 3265] r7956 - in code/branches/kicklib: cmake src src/external/enet

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-24 07:40:07 +0100 (Thu, 24 Feb 2011)
New Revision: 7956

Modified:
   code/branches/kicklib/cmake/LibraryConfig.cmake
   code/branches/kicklib/src/CMakeLists.txt
   code/branches/kicklib/src/external/enet/win32.c
   code/branches/kicklib/src/external/enet/win32.h
Log:
Merged revisions 7954 and 7955 from trunk to kicklib to fix the msvc9+Ogre1.7 build.

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-24 06:36:44 UTC (rev 7955)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-24 06:40:07 UTC (rev 7956)
@@ -101,6 +101,8 @@
 FIND_PACKAGE(ZLIB            REQUIRED)
 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)
   FIND_PACKAGE(DbgHelp)

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-02-24 06:36:44 UTC (rev 7955)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-02-24 06:40:07 UTC (rev 7956)
@@ -32,8 +32,9 @@
 
 ####### 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
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)

Modified: code/branches/kicklib/src/external/enet/win32.c
===================================================================
--- code/branches/kicklib/src/external/enet/win32.c	2011-02-24 06:36:44 UTC (rev 7955)
+++ code/branches/kicklib/src/external/enet/win32.c	2011-02-24 06:40:07 UTC (rev 7956)
@@ -7,6 +7,7 @@
 #define _WIN32_WINNT 0x0501
 
 #include <time.h>
+#include <ws2tcpip.h>
 #define ENET_BUILDING_LIB 1
 #include "enet/enet.h"
 

Modified: code/branches/kicklib/src/external/enet/win32.h
===================================================================
--- code/branches/kicklib/src/external/enet/win32.h	2011-02-24 06:36:44 UTC (rev 7955)
+++ code/branches/kicklib/src/external/enet/win32.h	2011-02-24 06:40:07 UTC (rev 7956)
@@ -14,7 +14,6 @@
 
 #include <stdlib.h>
 #include <winsock2.h>
-#include <ws2tcpip.h>
 
 typedef SOCKET ENetSocket;