Changeset 2690 for code/branches/buildsystem3/src/orxonox/Main.cc

Timestamp:

Feb 23, 2009, 8:57:42 PM (15 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)

File:

• code/branches/buildsystem3/src/orxonox/Main.cc (modified) (2 diffs)

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)