Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6044


Ignore:
Timestamp:
Nov 11, 2009, 12:33:54 PM (14 years ago)
Author:
rgrieder
Message:

Small fixes in IOConsole, ConfigFileManager and msvc compile flags.

Location:
code/branches/console
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/console/cmake/CompilerConfigMSVC.cmake

    r5929 r6044  
    149149# Use Link time code generation for Release config if ORXONOX_RELEASE is defined
    150150IF(ORXONOX_RELEASE)
     151  REMOVE_COMPILER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
    151152  ADD_LINKER_FLAGS("-LTCG" ReleaseAll CACHE)
    152153ENDIF()
  • code/branches/console/src/libraries/core/ConfigFileManager.h

    r5738 r6044  
    5454    };
    5555
    56     bool config(const std::string& classname, const std::string& varname, const std::string& value);
    57     bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
    58     void reloadConfig();
    59     void saveConfig();
    60     void cleanConfig();
    61     void loadSettings(const std::string& filename);
     56    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value);
     57    _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
     58    _CoreExport void reloadConfig();
     59    _CoreExport void saveConfig();
     60    _CoreExport void cleanConfig();
     61    _CoreExport void loadSettings(const std::string& filename);
    6262
    6363
  • code/branches/console/src/libraries/core/IOConsole.cc

    r6041 r6044  
    301301    {
    302302        std::string output = text;
     303        int level = this->extractLogLevel(&output);
     304
    303305/*
    304         int level = this->extractLogLevel(&output);
    305 
    306306        // Colour line
    307307        switch (level)
     
    349349            // Move cursor down (don't create a new line here because the buffer might flush then!)
    350350            this->cout_ << "\033[1E";
    351             //this->cout_ << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, ";
    352             //this->cout_ <<               std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms tick time";
    353             this->cout_ << "Terminal width: " << this->terminalWidth_ << ", height: " << this->terminalHeight_;
     351            this->cout_ << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, ";
     352            this->cout_ <<               std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms tick time";
     353//            this->cout_ << "Terminal width: " << this->terminalWidth_ << ", height: " << this->terminalHeight_;
    354354            // Restore cursor position
    355355            this->cout_ << "\033[u";
Note: See TracChangeset for help on using the changeset viewer.