Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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/cmake
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ipv6/cmake/LibraryConfig.cmake

    r7329 r7386  
    176176  OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
    177177  OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
    178   OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
     178  #OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
    179179  OPTION(LINK_OGRE_DYNAMIC  "Link OGRE dynamically on Windows" TRUE)
    180180  OPTION(LINK_TCL_DYNAMIC   "Link TCL dynamically on Windows" TRUE)
     
    189189  IF(DEPENDENCY_PACKAGE_ENABLE)
    190190    MARK_AS_ADVANCED(
    191       LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC LINK_ENET_DYNAMIC
     191      LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC #LINK_ENET_DYNAMIC
    192192      LINK_OGRE_DYNAMIC  LINK_TCL_DYNAMIC   LINK_ZLIB_DYNAMIC
    193193      LINK_LUA_DYNAMIC
  • code/branches/ipv6/cmake/PackageConfig.cmake

    r7244 r7386  
    8282SET(ENV{CEGUIDIR}              ${DEP_INCLUDE_DIR}/cegui)
    8383SET(ENV{DXSDK_DIR}             ${DEP_INCLUDE_DIR}/directx)
    84 SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
     84#SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
    8585SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
    8686SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR}/libogg)
Note: See TracChangeset for help on using the changeset viewer.