Changeset 6044

Timestamp:

Nov 11, 2009, 12:33:54 PM (15 years ago)

Author:

rgrieder

Message:

Small fixes in IOConsole, ConfigFileManager and msvc compile flags.

Location:

code/branches/console

Files:

• cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
• src/libraries/core/ConfigFileManager.h (modified) (1 diff)
• src/libraries/core/IOConsole.cc (modified) (2 diffs)

code/branches/console/cmake/CompilerConfigMSVC.cmake

@@ -149 +149 @@
 # 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()

code/branches/console/src/libraries/core/ConfigFileManager.h

@@ -54 +54 @@
     };
 
-    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);
 
 

code/branches/console/src/libraries/core/IOConsole.cc

@@ -301 +301 @@
     {
         std::string output = text;
+        int level = this->extractLogLevel(&output);
+
 /*
-        int level = this->extractLogLevel(&output);
-
         // Colour line
         switch (level)
@@ -349 +349 @@
             // 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";