Changeset 8363 for code/trunk

Timestamp:

Apr 30, 2011, 4:36:04 AM (14 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.

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/tools/GenerateToluaBindings.cmake (modified) (1 diff)
• src/OrxonoxConfig.cmake (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (2 diffs)
• src/external/tolua/lua/package.lua (modified) (1 diff)

code/trunk/CMakeLists.txt

@@ -111 +111 @@
 INSTALL(SCRIPT cmake/InstallCheck.cmake)
 
-# Enable expensive optimisations: use this for a binary release build
-OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
-
 IF(APPLE)
   # Set 10.5 as the base SDK by default

code/trunk/cmake/tools/GenerateToluaBindings.cmake

@@ -63 +63 @@
   ENDIF()
 
-  # Tolua binding speedup if required
-  IF(ORXONOX_RELEASE)
-    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-DTOLUA_RELEASE")
-  ENDIF()
-
   # Create temporary package file and implicit dependencies
   FILE(REMOVE ${_tolua_pkgfile})

code/trunk/src/OrxonoxConfig.cmake

@@ -72 +72 @@
 SET(ORX_HAVE_STDINT_H ${HAVE_STDINT_H})
 
+# XCode and Visual Studio support multiple configurations. In order to tell
+# about the active one we have to define the macro for each configuration
+ADD_COMPILER_FLAGS("-DCMAKE_Debug_BUILD"          Debug)
+ADD_COMPILER_FLAGS("-DCMAKE_Release_BUILD"        Release)
+ADD_COMPILER_FLAGS("-DCMAKE_RelWithDebInfo_BUILD" RelWithDebInfo)
+ADD_COMPILER_FLAGS("-DCMAKE_MinSizeRel_BUILD"     MinSizeRel)
+
 IF(MSVC)
   # Check whether we can use Visual Leak Detector

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;

code/trunk/src/external/tolua/lua/package.lua

@@ -135 +135 @@
         i = i+1
     end
+
+    output('\n')
+    output('#ifdef ORXONOX_RELEASE\n')
+    output('#  define TOLUA_RELEASE\n')
+    output('#endif\n')
 
     if self:requirecollection(_collect) then