Changeset 8363 for code/trunk/src/OrxonoxConfig.h.in

Timestamp:

Apr 30, 2011, 4:36:04 AM (13 years ago)

Author:

rgrieder

Message:

To avoid further confusion, I linked ORXONOX_RELEASE to the 'Release' and 'MinSizeRel' configurations. The variable is therefore not anymore available in CMake.
That means defining what these configurations actually mean in the context of Orxonox:

Debug: No optimisations and additional debug information. NOT distributable.
RelWithDebInfo: Optimisations enabled, but also generates debug information. Should be the default mode for development.
Release: With optimisations, but no debug symbols. Use this configuration to make a release binary.
MinSizeRel: Like Release, but optimised for size instead of speed. Not really useful for us.

File:

• code/trunk/src/OrxonoxConfig.h.in (modified) (2 diffs)

code/trunk/src/OrxonoxConfig.h.in

@@ -143 +143 @@
  * Apple Settings
  *-------------------------------*/
-
-
-/*---------------------------------
- * Options
- *-------------------------------*/
-#cmakedefine ORXONOX_RELEASE  ///< Enables expensive (build time) optimisations and disables certain features
 
 
@@ -185 +179 @@
 */
 
+// Configurations Release and MinSizeRel are designed for redistribution while
+// RelWithDebInfo is more for development
+// ORXONOX_RELEASE simplifies this a little bit
+#if defined(CMAKE_Release_BUILD) || defined(CMAKE_MinSizeRel_BUILD)
+#  define ORXONOX_RELEASE
+#endif
+
 // Include memory leak detector if available and not building actual release
 #cmakedefine HAVE_VLD
-#if defined(HAVE_VLD) && !defined(ORXONOX_RELEASE)
+#if defined(HAVE_VLD) && !defined(NDEBUG)
 typedef uint32_t UINT32;
 typedef wchar_t WCHAR;