Changeset 2690 for code/branches/buildsystem3/src/orxonox

Timestamp:

Feb 23, 2009, 8:57:42 PM (16 years ago)

Author:

rgrieder

Message:

• Moved def_keybindings to media repository in folder defaultConfig
• If you have a better name for that folder, you're welcome
• the "def_" prefix has been removed
• ConfigFileManager now looks for a file in media/defaultConfig with the same name if the config file does not exist yet
• No file gets written while only loading
• Removed hacky GCC 3 warning code for each library and instead just put "Wno-sign-compare" to the GCC 3 flags (that will remove all boost::filesystem warnings)
• ogre.cfg still remains on tardis for the development build (not install though)

Location:

code/branches/buildsystem3/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Main.cc (modified) (2 diffs)
• gamestates/GSGraphics.cc (modified) (2 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSLevel.h (modified) (1 diff)

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

@@ -39 +39 @@
 # Not using precompiled header files: Avoid dependencies
 INCLUDE_DIRECTORIES(pch/nopch)
-
-IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
-  # Get around displaying a few hundred lines of warning code
-  SET_SOURCE_FILES_PROPERTIES(
-    gamestates/GSGraphics.cc
-    gui/GUIManager.cc
-    PROPERTIES COMPILE_FLAGS "-Wno-sign-compare"
-  )
-ENDIF()
 
 ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})

code/branches/buildsystem3/src/orxonox/Main.cc

@@ -37 +37 @@
 #include <exception>
 #include <cassert>
-#include <fstream>
 
 #include "OrxonoxConfig.h"
@@ -95 +94 @@
     // First, determine whether we have an installed or a binary dir run
     // The latter occurs when simply running from the build directory
-    std::ifstream probe;
-    probe.open("orxonox_dev_build.keep_me");
-    if (probe)
-    {
-        Core::setDevBuild();
-        probe.close();
-    }
+    Core::checkDevBuild();
+
+    // Make sure the directories we write in exist or else make them
+    Core::createDirectories();
 
     // create a signal handler (only active for linux)

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

@@ -107 +107 @@
         SetConfigValue(ogreLogLevelCritical_, 2)
             .description("Corresponding orxonox debug level for ogre Critical");
-        SetConfigValue(defaultMasterKeybindings_, "def_masterKeybindings.ini")
-            .description("Filename of default master keybindings.");
     }
 
@@ -148 +146 @@
         // Configure master input state with a KeyBinder
         masterKeyBinder_ = new KeyBinder();
-        masterKeyBinder_->loadBindings("masterKeybindings.ini", defaultMasterKeybindings_);
+        masterKeyBinder_->loadBindings("masterKeybindings.ini");
         inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);
 

code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.h

@@ -105 +105 @@
         int                   ogreLogLevelNormal_;       //!< Corresponding Orxonx debug level for LL_NORMAL
         int                   ogreLogLevelCritical_;     //!< Corresponding Orxonx debug level for LL_CRITICAL
-        std::string           defaultMasterKeybindings_; //!< Filename of default master keybindings.
 
         // console commands

code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.cc

@@ -75 +75 @@
     {
         SetConfigValue(keyDetectorCallbackCode_, "KeybindBindingStringKeyName=");
-        SetConfigValue(defaultKeybindings_, "def_keybindings.ini")
-            .description("Filename of default keybindings.");
     }
 
@@ -85 +83 @@
             inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game", 20);
             keyBinder_ = new KeyBinder();
-            keyBinder_->loadBindings("keybindings.ini", defaultKeybindings_);
+            keyBinder_->loadBindings("keybindings.ini");
             inputState_->setHandler(keyBinder_);
 

code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.h

@@ -66 +66 @@
         //##### ConfigValues #####
         std::string           keyDetectorCallbackCode_;
-        //! Filename of default keybindings.
-        std::string           defaultKeybindings_;
 
         // console commands