Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10209


Ignore:
Timestamp:
Jan 29, 2015, 5:44:37 PM (5 years ago)
Author:
muemart
Message:

More MSVC fixes

  • Update dependecy package version requirements
  • Update Visual Leak Detector detection and linking Headers are not needed because symbols are force referenced (this is all the header does, anyway)
Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/PackageConfigMSVC.cmake

    r10208 r10209  
    2929
    3030  INCLUDE(CheckPackageVersion)
    31   CHECK_PACKAGE_VERSION(4.4 6.0)
     31  CHECK_PACKAGE_VERSION(6.0 7.0)
    3232
    3333  # 64 bit system?
  • code/trunk/cmake/tools/FindVLD.cmake

    r8412 r10209  
    2626INCLUDE(FindPackageHandleStandardArgs)
    2727
    28 FIND_PATH(VLD_INCLUDE_DIR vld.h
    29   PATH_SUFFIXES "Visual Leak Detector/include"
    30 )
    3128FIND_LIBRARY(VLD_LIBRARY
    3229  NAMES vld
     
    3734FIND_PACKAGE_HANDLE_STANDARD_ARGS(VLD DEFAULT_MSG
    3835  VLD_LIBRARY
    39   VLD_INCLUDE_DIR
    4036)
    4137
    4238MARK_AS_ADVANCED(
    43   VLD_INCLUDE_DIR
    4439  VLD_LIBRARY
    4540)
  • code/trunk/src/SourceConfig.cmake

    r9683 r10209  
    6363  IF(VISUAL_LEAK_DETECTOR_ENABLE)
    6464    # Force library linking by forcing the inclusion of a symbol
    65     ADD_LINKER_FLAGS("-INCLUDE:__imp_?vld@@3VVisualLeakDetector@@A" Debug)
     65    ADD_LINKER_FLAGS("-INCLUDE:__imp_?g_vld@@3VVisualLeakDetector@@A" Debug)
    6666    IF(MSVC90)
    6767      # VS 2008 incremental linker crashes with /INCLUDE most of the time
     
    136136ENDIF()
    137137
    138 IF(VISUAL_LEAK_DETECTOR_ENABLE)
    139   INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR})
    140 ENDIF()
    141 
    142138############## CEGUI OGRE Renderer ##############
    143139
Note: See TracChangeset for help on using the changeset viewer.