Changeset 7806 for code/forks/sandbox_qt
- Timestamp:
- Dec 26, 2010, 12:00:14 AM (14 years ago)
- Location:
- code/forks/sandbox_qt
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake
r7439 r7806 35 35 36 36 ######################## Options ######################## 37 38 # Currently VLD has a problem with MSVC9 although it actually is supported39 IF(MSVC80)40 OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)41 ENDIF()42 # Make sure the value is "on" or "off" for vld.ini43 IF(VISUAL_LEAK_DETECTOR_ENABLE)44 SET(VISUAL_LEAK_DETECTOR_ENABLE on)45 ELSE()46 SET(VISUAL_LEAK_DETECTOR_ENABLE off)47 ENDIF()48 37 49 38 # Orxonox only supports MSVC 8 and above, which gets asserted above -
code/forks/sandbox_qt/cmake/PackageConfigMSVC.cmake
r7421 r7806 56 56 #SET(TCL_LIBRARY ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "") 57 57 58 # Visual Leak Detector59 SET(VLD_INCLUDE_DIR ${DEP_INCLUDE_DIR}/vld CACHE PATH "")60 SET(VLD_LIBRARY_DIR ${DEP_LIBRARY_DIR} CACHE PATH "")61 LINK_DIRECTORIES(${VLD_LIBRARY_DIR}) # Used for auto-linking62 MARK_AS_ADVANCED(VLD_INCLUDE_DIR VLD_LIBRARY_DIR)63 64 58 ENDIF(MSVC) -
code/forks/sandbox_qt/src/CMakeLists.txt
r7805 r7806 56 56 INCLUDE_DIRECTORIES( 57 57 # External 58 ${VLD_INCLUDE_DIR}59 58 60 59 # All includes in "externals" should be prefixed with the path -
code/forks/sandbox_qt/src/OrxonoxConfig.cmake
r7380 r7806 79 79 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H) 80 80 81 IF(MSVC) 82 # Check whether we can use Visual Leak Detector 83 FIND_FILE(VLD_DLL vld_x86.dll) 84 IF(VLD_DLL) 85 SET(HAVE_VLD TRUE) 86 OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off) 87 # Make sure the value is "on" or "off" for vld.ini 88 IF(VISUAL_LEAK_DETECTOR_ENABLE) 89 SET(VISUAL_LEAK_DETECTOR_ENABLE on) 90 ELSE() 91 SET(VISUAL_LEAK_DETECTOR_ENABLE off) 92 ENDIF() 93 ENDIF() 94 MARK_AS_ADVANCED(VLD_DLL) 95 ENDIF() 96 81 97 ############## Configured Headers ############### 82 98 -
code/forks/sandbox_qt/src/OrxonoxConfig.h.in
r7421 r7806 179 179 */ 180 180 181 // Always include the memory leak detector for MSVC except for actual releases 182 // Note: Although officially supported, VLD does not work with MSVC 9 183 #if defined(ORXONOX_COMPILER_MSVC) && _MSC_VER < 1500 && !defined(ORXONOX_RELEASE) 181 // Include memory leak detector if available and not building actual release 182 #cmakedefine HAVE_VLD 183 #if defined(HAVE_VLD) && !defined(ORXONOX_RELEASE) 184 typedef UINT32 uint32_t; 185 typedef wchar_t WCHAR; 186 struct HINSTANCE__ { int unused; }; 187 typedef struct HINSTANCE__ * HINSTANCE; 188 typedef HINSTANCE HMODULE; 184 189 # include <vld.h> 185 190 #endif
Note: See TracChangeset
for help on using the changeset viewer.