Changeset 7818 for code/trunk/src

Timestamp:

Dec 26, 2010, 9:07:43 PM (14 years ago)

Author:

rgrieder

Message:

Merged changes related to Visual Leak Detector and source file handling from sandbox QT to trunk.

Location:

code/trunk/src

Files:

• CMakeLists.txt (modified) (3 diffs)
• OrxonoxConfig.cmake (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (1 diff)
• SpecialConfig.h.in (modified) (1 diff)

code/trunk/src/CMakeLists.txt

@@ -84 +84 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
-  ${VLD_INCLUDE_DIR}
 
   # All includes in "externals" should be prefixed with the path
@@ -123 +122 @@
 ################## Executable ###################
 
+SET_SOURCE_FILES(ORXONOX_MAIN_SRC_FILES Orxonox.cc)
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/libraries
@@ -139 +140 @@
     orxonox
   SOURCE_FILES
-    Orxonox.cc
+    ${ORXONOX_MAIN_SRC_FILES}
   OUTPUT_NAME orxonox
 )

code/trunk/src/OrxonoxConfig.cmake

@@ -79 +79 @@
 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
 
+IF(MSVC)
+  # Check whether we can use Visual Leak Detector
+  FIND_FILE(VLD_DLL vld_x86.dll)
+  IF(VLD_DLL)
+    SET(HAVE_VLD TRUE)
+    OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)
+    # Make sure the value is "on" or "off" for vld.ini
+    IF(VISUAL_LEAK_DETECTOR_ENABLE)
+      SET(VISUAL_LEAK_DETECTOR_ENABLE on)
+    ELSE()
+      SET(VISUAL_LEAK_DETECTOR_ENABLE off)
+    ENDIF()
+  ENDIF()
+  MARK_AS_ADVANCED(VLD_DLL)
+ENDIF()
+
 ############## Configured Headers ###############
 

code/trunk/src/OrxonoxConfig.h.in

@@ -179 +179 @@
 */
 
-// Always include the memory leak detector for MSVC except for actual releases
-// Note: Although officially supported, VLD does not work with MSVC 9
-#if defined(ORXONOX_COMPILER_MSVC) && _MSC_VER < 1500 && !defined(ORXONOX_RELEASE)
+// Include memory leak detector if available and not building actual release
+#cmakedefine HAVE_VLD
+#if defined(HAVE_VLD) && !defined(ORXONOX_RELEASE)
+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

code/trunk/src/SpecialConfig.h.in

@@ -52 +52 @@
 #cmakedefine DBGHELP_FOUND                  ///< If DbgHelp was found on windows
 
-#cmakedefine ORXONOX_USE_WINMAIN            ///< Using MSVC or XCode IDE
+#cmakedefine ORXONOX_USE_WINMAIN            ///< Whether or not the console window is started as well
 
 // Handle default ConfigValues