Changeset 2643 for code/branches/buildsystem2/src/orxonox

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/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Settings.cc (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (1 diff)
• orxonox.vcproj.user (modified) (1 diff)

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"
         >