Changeset 2509 for code/branches/buildsystem2/src/util

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/util (modified) (1 prop)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/String.cc (modified) (1 diff)
• src/util/String.h (modified) (1 diff)

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -14 +14 @@
 
 ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
+TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
 
-TARGET_LINK_LIBRARIES(util
-  ${OGRE_LIBRARIES}
 )
+

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__ */