Changeset 2643 for code/branches/buildsystem2/cmake

Timestamp:

Feb 12, 2009, 9:40:33 AM (16 years ago)

Author:

rgrieder

Message:

• Default config values for OGRE plugins, the plugins folder and the media directory are now configured in OrxonoxConfig.h
• You should not need a preconfigured orxonox.ini anymore after installation
• Small bugfixes in compiler flags and visual studio project generation
• probable bugfix in FlagUtilities.cmake

Location:

code/branches/buildsystem2/cmake

Files:

• BuildConfigMSVC.cmake (modified) (1 diff)
• FlagUtilities.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/BuildConfigMSVC.cmake

@@ -116 +116 @@
 # CMake default flags: -MANIFEST -STACK:10000000 -machine:I386
 # and INCREMENTAL and DEBUG for debug versions
-ADD_LINKER_FLAGS("-OPT:REF -OPT:ICF -OPT:NOWIN98" Release MinSizeRel CACHE)
+ADD_LINKER_FLAGS("-OPT:REF -OPT:ICF" Release MinSizeRel CACHE)
+ADD_LINKER_FLAGS("-OPT:NOWIN98" MSVC80 CACHE)

code/branches/buildsystem2/cmake/FlagUtilities.cmake

@@ -50 +50 @@
   IF(NOT DEFINED _INTERNAL_${_varname} OR "${_INTERNAL_${_varname}}" STREQUAL "${${_varname}}")
     SET(${_varname} "${_value}" CACHE ${_type} "${_docstring}" FORCE)
-  ENDIF()
-  SET(_INTERNAL_${_varname} "${_value}" CACHE INTERNAL "Do not edit in any case!")
+    SET(_INTERNAL_${_varname} "${_value}" CACHE INTERNAL "Do not edit in any case!")
+  ENDIF()
 ENDMACRO(SET_CACHE)