Changeset 2534

Timestamp:

Dec 28, 2008, 7:12:44 PM (16 years ago)

Author:

rgrieder

Message:

• Removed ugly hack with windows/unix file path conversion.
• Removed obsolete entries in msvc files (tolua_bind.h)

Location:

code/branches/buildsystem2

Files:

• TODO_buildsystem (deleted)
• src/orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)
• src/util/String.cc (modified) (1 diff)
• src/util/String.h (modified) (1 diff)
• visual_studio/vc8/core.vcproj (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (1 diff)

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

@@ -31 +31 @@
 
 #include <fstream>
+#include <boost/filesystem.hpp>
+
 #include <OgreConfigFile.h>
 #include <OgreFrameListener.h>
@@ -371 +373 @@
             ogrePluginsFolder_ = ".";
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-        convertToWindowsPath(&ogrePluginsFolder_);
-#else
-        convertToUnixPath(&ogrePluginsFolder_);
-#endif
-
+        boost::filesystem::path folder(ogrePluginsFolder_);
         // Do some SubString magic to get the comma separated list of plugins
         SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
         for (unsigned int i = 0; i < plugins.size(); ++i)
-            ogreRoot_->loadPlugin(ogrePluginsFolder_ + plugins[i]);
+            ogreRoot_->loadPlugin((folder / plugins[i]).native_file_string());
     }
 

code/branches/buildsystem2/src/util/String.cc

@@ -493 +493 @@
     }
 }
-
-/**
-    @brief Converts a path string to windows with "\" instead of "/".
-    @param str String pointer to be manipulated
-*/
-void convertToWindowsPath(std::string* str)
-{
-    std::string& path = *str;
-    // replace all occurences of "/" with "\"
-    for (unsigned int i = 0; i < path.length(); ++i)
-    {
-        if (path[i] == '/')
-            path[i] = '\\';
-    }
-    // add an extra '\\' at the end to make it a complete path
-    if (path != "" && path[path.length() - 1] != '\\')
-        path.append("\\");
-}
-
-/**
-    @brief Converts a path string to unix with "/" instead of "\".
-    @param str String pointer to be manipulated
-*/
-void convertToUnixPath(std::string* str)
-{
-    std::string& path = *str;
-    // replace all occurences of "\" with "/"
-    for (unsigned int i = 0; i < path.length(); ++i)
-    {
-        if (path[i] == '\\')
-            path[i] = '/';
-    }
-    // add an extra '\\' at the end to make it a complete path
-    if (path != "" && path[path.length() - 1] != '/')
-        path.append("/");
-}

code/branches/buildsystem2/src/util/String.h

@@ -81 +81 @@
 }
 
-_UtilExport void         convertToWindowsPath(std::string* str);
-_UtilExport void         convertToUnixPath(std::string* str);
-
 #endif /* _Util_String_H__ */

code/branches/buildsystem2/visual_studio/vc8/core.vcproj

@@ -441 +441 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\tolua_bind.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="$(IntDir)\ToluaBindCore.h"
                                 >

code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj

@@ -843 +843 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\orxonox\tolua_bind.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="$(IntDir)\ToluaBindOrxonox.h"
                                 >