Changeset 8409

Timestamp:

May 6, 2011, 3:37:01 AM (13 years ago)

Author:

rgrieder

Message:

Found a better solution to make the Visual Leak Detector (MSVC specific) work so that it doesn't need to be included in every single source file.

Location:

code/trunk

Files:

• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/OrxonoxConfig.cmake (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (1 diff)

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -304 +304 @@
   ENDIF()
 
+  # Visual Leak Detector specific stuff (avoids the include)
+  IF(HAVE_VLD)
+    TARGET_LINK_LIBRARIES(${_target_name} ${VLD_LIBRARY})
+  ENDIF()
+
   # RPATH settings for the installation
   IF("${_target_type}" STREQUAL "LIBRARY")

code/trunk/src/OrxonoxConfig.cmake

@@ -92 +92 @@
       SET(VISUAL_LEAK_DETECTOR_ENABLE off)
     ENDIF()
+    SET(VLD_LIBRARY vld.lib)
+    # Force symbol reference
+    # The alternative would be to include vld.h everywhere (includes windows.h)
+    ADD_LINKER_FLAGS("-INCLUDE:__imp_?vld@@3VVisualLeakDetector@@A" Debug)
   ENDIF()
   MARK_AS_ADVANCED(VLD_DLL)

code/trunk/src/OrxonoxConfig.h.in

@@ -185 +185 @@
     || defined(CMAKE_RelWithDebInfo_BUILD)
 #  define ORXONOX_RELEASE
-#endif
-
-// Include memory leak detector if available and not building actual release
-#cmakedefine HAVE_VLD
-#if defined(HAVE_VLD) && !defined(NDEBUG)
-typedef uint32_t UINT32;
-typedef wchar_t WCHAR;
-struct HINSTANCE__;
-typedef struct HINSTANCE__* HINSTANCE;
-typedef HINSTANCE HMODULE;
-#  ifndef NULL
-#    define NULL 0
-#  endif
-#  include <vld.h>
 #endif