Changeset 2697 for code/branches

Timestamp:

Feb 23, 2009, 11:35:25 PM (16 years ago)

Author:

rgrieder

Message:

• Removed log folder again (not necessary at all)
• Making more use of boost::filesystem in GSGraphics

Location:

code/branches/buildsystem3

Files:

• CMakeLists.txt (modified) (1 diff)
• log (deleted)
• src/orxonox/gamestates/GSGraphics.cc (modified) (3 diffs)

code/branches/buildsystem3/CMakeLists.txt

@@ -55 +55 @@
 
 ADD_SUBDIRECTORY(config)
-ADD_SUBDIRECTORY(log)
+SET(ORXONOX_LOG_DEV_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
 # Creates the actual project

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

@@ -293 +293 @@
         }
 
-        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath() + ogreConfigFile_);
-        boost::filesystem::path ogreLogFilepath(Core::getLogPath() + ogreLogFile_);
+        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath());
+        ogreConfigFilepath /= this->ogreConfigFile_;
+        boost::filesystem::path ogreLogFilepath(Core::getLogPath());
+        ogreLogFilepath /= this->ogreLogFile_;
 
         // create a new logManager
@@ -312 +314 @@
 
         // check for config file existence because Ogre displays (caught) exceptions if not
-        std::ifstream probe;
-        probe.open(ogreConfigFilepath.file_string().c_str());
-        if (!probe)
+        if (!boost::filesystem::exits(ogreConfigFilepath))
         {
             // create a zero sized file
@@ -321 +321 @@
             creator.close();
         }
-        else
-            probe.close();
 
         // Leave plugins file empty. We're going to do that part manually later