Changeset 2685 for code/branches/buildsystem3/src/core/input/KeyBinder.cc

Timestamp:

Feb 20, 2009, 5:32:04 PM (15 years ago)

Author:

rgrieder

Message:

Fixed install target:

• log and config file go a to separate folder each
• The SignalHandler crash log is now "orxonox_crash.log" to avoid opening the file twice which might result in problems
• moved tcl scripts to media/tcl8.#/ as a temporary solution. I've also created a ticket to fix this.
• UPDATE YOUR MEDIA REPOSITORY
• orxonox.log pre-main gets written to either %TEMP% (windows) or /tmp (Unix) and when the path was set, the content is copied.
• removed Settings class and moved media path to Core
• media, log and config path are now all in Core where only the media path can be configured via ini file or command line
• Core::isDevBuild() tells whether we are running in the build or the installation directory (determined by the presence of "orxonox_dev_build.kepp_me" in the binary dir)
• renamed Settings::getDataPath to Core::getMediaPath

File:

• code/branches/buildsystem3/src/core/input/KeyBinder.cc (modified) (3 diffs)

code/branches/buildsystem3/src/core/input/KeyBinder.cc

@@ -36 +36 @@
 #include <fstream>
 #include <string>
+#include <boost/filesystem.hpp>
 
 #include "util/Convert.h"
@@ -42 +43 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
+#include "core/Core.h"
 #include "InputCommands.h"
 #include "InputManager.h"
@@ -253 +255 @@
             return;
 
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/filename);
+
         // get bindings from default file if filename doesn't exist.
         std::ifstream infile;
-        infile.open(filename.c_str());
+        infile.open(filepath.native_file_string().c_str());
         if (!infile)
         {