Changeset 3196 for code/trunk/bin

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• bin/CMakeLists.txt (modified) (3 diffs)
• bin/vld.ini.in (copied) (copied from code/branches/pch/bin/vld.ini.in)

code/trunk/bin/CMakeLists.txt

@@ -33 +33 @@
   ENDFOREACH(_script)
 ENDIF()
+# Also copy vld.ini (visual leak detector config) for MSVC
+IF(MSVC)
+  LIST(APPEND RUN_SCRIPTS vld.ini)
+ENDIF()
 
 IF(NOT CMAKE_CONFIGURATION_TYPES)
@@ -39 +43 @@
 ELSE()
   SET(_subdirs ${CMAKE_CONFIGURATION_TYPES})
-  SEt(_default_subdir Debug)
+  SEt(_default_subdir) # No default subdir
 ENDIF()
 STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
@@ -52 +56 @@
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CURRENT_RUNTIME_DIR}/${_script} @ONLY)
     IF(_subdir STREQUAL _default_subdir)
-      # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc.
+      # Convenience script to be used when sitting in the binary directory. Does nothing for MSVC
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CMAKE_BINARY_DIR}/${_script} @ONLY)
     ENDIF()