Changeset 2643

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

Files:

• cmake/BuildConfigMSVC.cmake (modified) (1 diff)
• cmake/FlagUtilities.cmake (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Settings.cc (modified) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• src/orxonox/orxonox.vcproj.user (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)
 

code/branches/buildsystem2/src/OrxonoxConfig.h.in

@@ -27 +27 @@
  *   Original code: OgrePlatform.h, licensed under the LGPL. The code
  *   has changed almost completely though.
+ *
+ *   Caution: Do not configure this file CMake configuration (Debug, Release, etc.)
+ *            dependent! XCode and Visual Studio have the same file for all.
  *
  */
@@ -139 +142 @@
  * Includes
  *-------------------------------*/
-/* Set whether we must suffix "ceguilua/" for the CEGUILua.h include */
-#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY
-
 /* Define the english written operators like and, or, xor
  * This is C++ standard, but the Microsoft compiler doesn't define them. */
@@ -174 +174 @@
 #endif
 
+
+/*---------------------------------
+ * Various Settings
+ *-------------------------------*/
+/* Set whether we must suffix "ceguilua/" for the CEGUILua.h include */
+#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY
+
+/* Defined if a precompiled depdency package was used. We then copy all libraries
+   too when installing. */
+#cmakedefine USE_DEPENDENCY_PACKAGE
+
+/* Handle default ConfigValues */
+namespace orxonox
+{
+    const char* const ORXONOX_MEDIA_PATH("@ORXONOX_MEDIA_DIRECTORY@");
+    
+#ifdef NDEBUG
+    const char* const ORXONOX_OGRE_PLUGINS("@OGRE_PLUGINS_RELEASE@");
+#  ifdef USE_DEPENDENCY_PACKAGE
+    const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
+#  elif
+    const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_RELEASE@");
+#  endif
+#else
+    const char* const ORXONOX_OGRE_PLUGINS("@OGRE_PLUGINS_DEBUG@");
+#  ifdef USE_DEPENDENCY_PACKAGE
+    const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
+#  elif
+    const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_DEBUG@");
+#  endif
+#endif
+}
+
+
 #endif /* _OrxonoxConfig_H__ */

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -86 +86 @@
     SET(MSVC_PLATFORM "Win32")
   ENDIF()
+  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
+         VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
 ENDIF(MSVC)

code/branches/buildsystem2/src/orxonox/Settings.cc

@@ -63 +63 @@
     void Settings::setConfigValues()
     {
-        SetConfigValue(dataPath_, "../../../media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
+        SetConfigValue(dataPath_, ORXONOX_MEDIA_PATH).description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
     }
 

code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc

@@ -100 +100 @@
         SetConfigValue(ogreConfigFile_,  "ogre.cfg")
             .description("Location of the Ogre config file");
-        SetConfigValue(ogrePluginsFolder_, ".")
+        SetConfigValue(ogrePluginsFolder_, ORXONOX_OGRE_PLUGINS_FOLDER)
             .description("Folder where the Ogre plugins are located.");
-        SetConfigValue(ogrePlugins_, "RenderSystem_GL, Plugin_ParticleFX")
+        SetConfigValue(ogrePlugins_, ORXONOX_OGRE_PLUGINS)
             .description("Comma separated list of all plugins to load.");
         SetConfigValue(ogreLogFile_,     "ogre.log")

code/branches/buildsystem2/src/orxonox/orxonox.vcproj.user

@@ -2 +2 @@
 <VisualStudioUserFile
         ProjectType="Visual C++"
-        Version="8.00"
+        Version="${VISUAL_STUDIO_VERSION_SIMPLE}.00"
         ShowAllFiles="false"
         >