recognize '\\' as a possible directory separator

libgen.h confirmed to work with mingw, thanks foxblock

fixes #28

diff --git a/src/loader/utility.cpp b/src/loader/utility.cpp
index f5011e6fe243ea97685ffefab3eb7421b93d8aa2..6d336672de217889888b26c8600cf3a5dbd8fb92 100644 (file)
--- a/src/loader/utility.cpp
+++ b/src/loader/utility.cpp
@@ -15,7 +15,6 @@ using std::string;
 namespace loader {
 
 string Dirname(const string &path) {
-       // unix version
        char *str(new char[path.size() + 1]);
        std::memcpy(str, path.c_str(), path.size());
        str[path.size()] = '\0';
@@ -25,12 +24,13 @@ string Dirname(const string &path) {
 }
 
 string CatPath(const string &lhs, const string &rhs) {
-       // unix version
        string path(lhs);
-       if (!path.empty() && path[path.size() - 1] != '/') {
+       if (!path.empty()
+                       && path[path.size() - 1] != '/'
+                       && path[path.size() - 1] != '\\') {
                path += '/';
        }
-       if (!rhs.empty() && rhs[0] == '/') {
+       if (!rhs.empty() && (rhs[0] == '/' || rhs[0] == '\\')) {
                path.append(rhs, 1, string::npos);
        } else {
                path += rhs;