[Orxonox-commit 1326] r6044 - in code/branches/console: cmake src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-11 12:33:54 +0100 (Wed, 11 Nov 2009)
New Revision: 6044

Modified:
   code/branches/console/cmake/CompilerConfigMSVC.cmake
   code/branches/console/src/libraries/core/ConfigFileManager.h
   code/branches/console/src/libraries/core/IOConsole.cc
Log:
Small fixes in IOConsole, ConfigFileManager and msvc compile flags.

Modified: code/branches/console/cmake/CompilerConfigMSVC.cmake
===================================================================
--- code/branches/console/cmake/CompilerConfigMSVC.cmake	2009-11-09 14:52:26 UTC (rev 6043)
+++ code/branches/console/cmake/CompilerConfigMSVC.cmake	2009-11-11 11:33:54 UTC (rev 6044)
@@ -148,5 +148,6 @@
 
 # Use Link time code generation for Release config if ORXONOX_RELEASE is defined
 IF(ORXONOX_RELEASE)
+  REMOVE_COMPILER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
   ADD_LINKER_FLAGS("-LTCG" ReleaseAll CACHE)
 ENDIF()

Modified: code/branches/console/src/libraries/core/ConfigFileManager.h
===================================================================
--- code/branches/console/src/libraries/core/ConfigFileManager.h	2009-11-09 14:52:26 UTC (rev 6043)
+++ code/branches/console/src/libraries/core/ConfigFileManager.h	2009-11-11 11:33:54 UTC (rev 6044)
@@ -53,12 +53,12 @@
         static const int numberOfReservedTypes = 1024;
     };
 
-    bool config(const std::string& classname, const std::string& varname, const std::string& value);
-    bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
-    void reloadConfig();
-    void saveConfig();
-    void cleanConfig();
-    void loadSettings(const std::string& filename);
+    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value);
+    _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
+    _CoreExport void reloadConfig();
+    _CoreExport void saveConfig();
+    _CoreExport void cleanConfig();
+    _CoreExport void loadSettings(const std::string& filename);
 
 
     /////////////////////

Modified: code/branches/console/src/libraries/core/IOConsole.cc
===================================================================
--- code/branches/console/src/libraries/core/IOConsole.cc	2009-11-09 14:52:26 UTC (rev 6043)
+++ code/branches/console/src/libraries/core/IOConsole.cc	2009-11-11 11:33:54 UTC (rev 6044)
@@ -300,9 +300,9 @@
     void IOConsole::printLogText(const std::string& text)
     {
         std::string output = text;
-/*
         int level = this->extractLogLevel(&output);
 
+/*
         // Colour line
         switch (level)
         {
@@ -348,9 +348,9 @@
             this->cout_ << "\033[s";
             // Move cursor down (don't create a new line here because the buffer might flush then!)
             this->cout_ << "\033[1E";
-            //this->cout_ << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, ";
-            //this->cout_ <<               std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms tick time";
-            this->cout_ << "Terminal width: " << this->terminalWidth_ << ", height: " << this->terminalHeight_;
+            this->cout_ << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, ";
+            this->cout_ <<               std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms tick time";
+//            this->cout_ << "Terminal width: " << this->terminalWidth_ << ", height: " << this->terminalHeight_;
             // Restore cursor position
             this->cout_ << "\033[u";
             this->bStatusPrinted_ = true;