[Orxonox-commit 1725] r6443 - in code/trunk: cmake src/libraries/util

rgrieder at orxonox.net rgrieder at orxonox.net
Mon Jan 4 15:52:43 CET 2010


Author: rgrieder
Date: 2010-01-04 15:52:43 +0100 (Mon, 04 Jan 2010)
New Revision: 6443

Modified:
   code/trunk/cmake/CompilerConfigMSVC.cmake
   code/trunk/src/libraries/util/Debug.h
Log:
Fixed two problems with the ORXONOX_RELEASE really release version.

Modified: code/trunk/cmake/CompilerConfigMSVC.cmake
===================================================================
--- code/trunk/cmake/CompilerConfigMSVC.cmake	2010-01-03 16:53:05 UTC (rev 6442)
+++ code/trunk/cmake/CompilerConfigMSVC.cmake	2010-01-04 14:52:43 UTC (rev 6443)
@@ -149,6 +149,7 @@
 
 # Use Link time code generation for Release config if ORXONOX_RELEASE is defined
 IF(ORXONOX_RELEASE)
-  REMOVE_COMPILER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
-  ADD_LINKER_FLAGS("-LTCG" ReleaseAll CACHE)
+  REMOVE_LINKER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
+  ADD_LINKER_FLAGS   ("-INCREMENTAL:NO"  ReleaseAll CACHE)
+  ADD_LINKER_FLAGS   ("-LTCG"            ReleaseAll CACHE)
 ENDIF()

Modified: code/trunk/src/libraries/util/Debug.h
===================================================================
--- code/trunk/src/libraries/util/Debug.h	2010-01-03 16:53:05 UTC (rev 6442)
+++ code/trunk/src/libraries/util/Debug.h	2010-01-04 14:52:43 UTC (rev 6443)
@@ -72,7 +72,7 @@
 
     // Adjust this to discard certain output with level > hardDebugLevel at compile time already
 #ifdef ORXONOX_RELEASE
-    const int hardDebugLevel = OutputLevel::Verbose
+    const int hardDebugLevel = OutputLevel::Verbose;
 #elif defined(NDEBUG)
     const int hardDebugLevel = OutputLevel::Verbose;
 #else




More information about the Orxonox-commit mailing list