[Orxonox-commit 2681] r7386 - in code/branches/ipv6: cmake src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-08 16:38:54 +0200 (Wed, 08 Sep 2010)
New Revision: 7386

Modified:
   code/branches/ipv6/cmake/LibraryConfig.cmake
   code/branches/ipv6/cmake/PackageConfig.cmake
   code/branches/ipv6/src/CMakeLists.txt
Log:
Added missing changes to remove ENet as external dependency and add it as internal one.

Modified: code/branches/ipv6/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/ipv6/cmake/LibraryConfig.cmake	2010-09-08 14:28:36 UTC (rev 7385)
+++ code/branches/ipv6/cmake/LibraryConfig.cmake	2010-09-08 14:38:54 UTC (rev 7386)
@@ -175,7 +175,7 @@
 IF(WIN32)
   OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
   OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
-  OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
+  #OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
   OPTION(LINK_OGRE_DYNAMIC  "Link OGRE dynamically on Windows" TRUE)
   OPTION(LINK_TCL_DYNAMIC   "Link TCL dynamically on Windows" TRUE)
   OPTION(LINK_ZLIB_DYNAMIC  "Link ZLib dynamically on Windows" TRUE)
@@ -188,7 +188,7 @@
 
   IF(DEPENDENCY_PACKAGE_ENABLE)
     MARK_AS_ADVANCED(
-      LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC LINK_ENET_DYNAMIC
+      LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC #LINK_ENET_DYNAMIC
       LINK_OGRE_DYNAMIC  LINK_TCL_DYNAMIC   LINK_ZLIB_DYNAMIC
       LINK_LUA_DYNAMIC
     )

Modified: code/branches/ipv6/cmake/PackageConfig.cmake
===================================================================
--- code/branches/ipv6/cmake/PackageConfig.cmake	2010-09-08 14:28:36 UTC (rev 7385)
+++ code/branches/ipv6/cmake/PackageConfig.cmake	2010-09-08 14:38:54 UTC (rev 7386)
@@ -81,7 +81,7 @@
 SET(ENV{BOOST_ROOT}            ${DEP_INCLUDE_DIR}/boost)
 SET(ENV{CEGUIDIR}              ${DEP_INCLUDE_DIR}/cegui)
 SET(ENV{DXSDK_DIR}             ${DEP_INCLUDE_DIR}/directx)
-SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
+#SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
 SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
 SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR}/libogg)
 SET(ENV{VORBISDIR}             ${DEP_INCLUDE_DIR}/libvorbis)

Modified: code/branches/ipv6/src/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/CMakeLists.txt	2010-09-08 14:28:36 UTC (rev 7385)
+++ code/branches/ipv6/src/CMakeLists.txt	2010-09-08 14:38:54 UTC (rev 7386)
@@ -37,7 +37,7 @@
 
 # If no defines are specified, these libs get linked statically
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
-ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
+#ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA_DYNAMIC)
 ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
@@ -60,6 +60,7 @@
 ENDIF()
 # If no defines are specified, these libs get linked dynamically
 ADD_COMPILER_FLAGS("-DCEGUILUA_STATIC"             WIN32 NOT _external_shared_link)
+ADD_COMPILER_FLAGS("-DENET_DLL"                    WIN32 NOT _external_shared_link)
 ADD_COMPILER_FLAGS("-DOGRE_GUIRENDERER_STATIC_LIB" WIN32 NOT _external_shared_link)
 ADD_COMPILER_FLAGS("-DOIS_STATIC_LIB"              WIN32 NOT _external_shared_link)
 ADD_COMPILER_FLAGS("-DTOLUA_STATIC_BUILD"          WIN32 NOT _external_shared_link)