Changeset 8368 for code/trunk/src

Timestamp:

May 1, 2011, 3:09:28 AM (13 years ago)

Author:

rgrieder

Message:

Added CMake configuration type "RelForDevs", which replaces "RelWithDebInfo". That latter is now equivalent to "Release", but with symbols.
Also, I removed debug symbol generation for Release and MinSizeRel when compiling with MSVC.

The new configuration should be used as standard Release mode when developing. The other three release configurations are for actual installed binaries (and behave again as the name suggests).

Location:

code/trunk/src

Files:

• OrxonoxConfig.cmake (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (1 diff)
• orxonox-main.vcproj.user.in (modified) (1 diff)
• orxonox-main.vcxproj.user.in (modified) (1 diff)

code/trunk/src/OrxonoxConfig.cmake

@@ -75 +75 @@
 # about the active one we have to define the macro for each configuration
 ADD_COMPILER_FLAGS("-DCMAKE_Debug_BUILD"          Debug)
+ADD_COMPILER_FLAGS("-DCMAKE_RelForDevs_BUILD"     RelForDevs)
 ADD_COMPILER_FLAGS("-DCMAKE_Release_BUILD"        Release)
 ADD_COMPILER_FLAGS("-DCMAKE_RelWithDebInfo_BUILD" RelWithDebInfo)

code/trunk/src/OrxonoxConfig.h.in

@@ -179 +179 @@
 */
 
-// Configurations Release and MinSizeRel are designed for redistribution while
-// RelWithDebInfo is more for development
+// Configurations Release, RelWithDebInfo and MinSizeRel are designed for
+// redistribution while RelForDevs is for development purposes
 // ORXONOX_RELEASE simplifies this a little bit
-#if defined(CMAKE_Release_BUILD) || defined(CMAKE_MinSizeRel_BUILD)
+#if defined(CMAKE_Release_BUILD) || defined(CMAKE_MinSizeRel_BUILD) \
+    || defined(CMAKE_RelWithDebInfo_BUILD)
 #  define ORXONOX_RELEASE
 #endif

code/trunk/src/orxonox-main.vcproj.user.in

@@ -8 +8 @@
                 <Configuration
                         Name="Debug|${MSVC_PLATFORM}"
+                        >
+                        <DebugSettings
+                                WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
+                                Environment="PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%"
+                                EnvironmentMerge="true"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="RelForDevs|${MSVC_PLATFORM}"
                         >
                         <DebugSettings

code/trunk/src/orxonox-main.vcxproj.user.in

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|${MSVC_PLATFORM}'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>
+    <LocalDebuggerWorkingDirectory>$(Outdir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelForDevs|${MSVC_PLATFORM}'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>