* remove unused libvorbisenc from FindOggVorbis and link path

[supertux.git] / src / file_system.cpp

diff --git a/src/file_system.cpp b/src/file_system.cpp
index 447c21e..5f5be1d 100644 (file)
--- a/src/file_system.cpp
+++ b/src/file_system.cpp
@@ -33,6 +33,8 @@ std::string dirname(const std::string& filename)
 {
   std::string::size_type p = filename.find_last_of('/');
   if(p == std::string::npos)
+    p = filename.find_last_of('\\');
+  if(p == std::string::npos)
     return "";
 
   return filename.substr(0, p+1);
@@ -42,6 +44,8 @@ std::string basename(const std::string& filename)
 {
   std::string::size_type p = filename.find_last_of('/');
   if(p == std::string::npos)
+    p = filename.find_last_of('\\');
+  if(p == std::string::npos)
     return filename;
 
   return filename.substr(p+1, filename.size()-p-1);
@@ -63,13 +67,13 @@ std::string normalize(const std::string& filename)
   const char* p = filename.c_str();
 
   while(true) {
-    while(*p == '/') {
+    while(*p == '/' || *p == '\\') {
       p++;
       continue;
     }
 
     const char* pstart = p;
-    while(*p != '/' && *p != 0) {
+    while(*p != '/' && *p != '\\' && *p != 0) {
       ++p;
     }