dmuratshin 9 years ago
parent
commit
1909553362
2 changed files with 6 additions and 3 deletions
  1. 5 2
      oxygine/src/core/STDFileSystem.cpp
  2. 1 1
      oxygine/src/core/gl/ShaderProgramGL.cpp

+ 5 - 2
oxygine/src/core/STDFileSystem.cpp

@@ -213,7 +213,8 @@ namespace oxygine
 #elif OXYGINE_EDITOR
 #elif OXYGINE_EDITOR
             return status_error;
             return status_error;
 #elif _WIN32
 #elif _WIN32
-            return DeleteFileA(buff) ? status_ok : status_error;
+            std::wstring wsPath = utf8tows(buff);
+            return DeleteFileW(wsPath.c_str()) ? status_ok : status_error;
 #else
 #else
             return (::remove(buff) != -1 ? status_ok : status_error);
             return (::remove(buff) != -1 ? status_ok : status_error);
 #endif
 #endif
@@ -264,7 +265,9 @@ namespace oxygine
 #elif OXYGINE_EDITOR
 #elif OXYGINE_EDITOR
             return status_error;
             return status_error;
 #elif _WIN32
 #elif _WIN32
-            return MoveFileA(buffSrc, buffDest) ? status_ok : status_error;
+            std::wstring s = utf8tows(buffSrc);
+            std::wstring d = utf8tows(buffDest);
+            return MoveFileW(s.c_str(), d.c_str()) ? status_ok : status_error;
 #else
 #else
             return (::rename(buffSrc, buffDest) != -1 ? status_ok : status_error);
             return (::rename(buffSrc, buffDest) != -1 ? status_ok : status_error);
 #endif
 #endif

+ 1 - 1
oxygine/src/core/gl/ShaderProgramGL.cpp

@@ -41,7 +41,7 @@ namespace oxygine
         if (length)
         if (length)
         {
         {
             str.resize(length);
             str.resize(length);
-            oxglGetShaderInfoLog(shader, (int)str.size(), NULL, &str.front());
+            oxglGetShaderInfoLog(shader, (int)str.size(), NULL, &str[0]);
         }
         }
         else
         else
             str.clear();
             str.clear();