Changeset 7386

Timestamp:

Sep 8, 2010, 4:38:54 PM (14 years ago)

Author:

rgrieder

Message:

Added missing changes to remove ENet as external dependency and add it as internal one.

Location:

code/branches/ipv6

Files:

• cmake/LibraryConfig.cmake (modified) (2 diffs)
• cmake/PackageConfig.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)

code/branches/ipv6/cmake/LibraryConfig.cmake

@@ -176 +176 @@
   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)
@@ -189 +189 @@
   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

code/branches/ipv6/cmake/PackageConfig.cmake

@@ -82 +82 @@
 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)

code/branches/ipv6/src/CMakeLists.txt

@@ -38 +38 @@
 # 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)
@@ -61 +61 @@
 # 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)