Changeset 2685 for code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.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/orxonox/gamestates/GSRoot.cc (modified) (4 diffs)

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

@@ -44 +44 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "Settings.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include "windows.h"
-
-   //Get around Windows hackery
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
+#  include <winbase.h>
 #endif
 
 namespace orxonox
 {
-    SetCommandLineArgument(dataPath, "").information("PATH");
     SetCommandLineArgument(limitToCPU, 1).information("0: off | #cpu");
 
@@ -71 +58 @@
         , bPaused_(false)
         , timeFactorPauseBackup_(1.0f)
-        , settings_(0)
         , tclBind_(0)
         , tclThreadManager_(0)
@@ -113 +99 @@
         this->luaBind_ = new LuaBind();
 
-        // instantiate Settings class
-        this->settings_ = new Settings();
-
-        std::string dataPath = CommandLine::getValue("dataPath");
-        if (dataPath != "")
-        {
-            if (*dataPath.end() != '/' && *dataPath.end() != '\\')
-                Settings::tsetDataPath(dataPath + "/");
-            else
-                Settings::tsetDataPath(dataPath);
-        }
-
         // initialise TCL
-        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclBind_ = new TclBind(Core::getMediaPath());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 
@@ -182 +156 @@
         delete this->tclBind_;
 
-        delete this->settings_;
         delete this->luaBind_;