Merge pull request #5848 from samuele3hu/develop_3_fix

Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
2014-03-18 15:52:07 +08:00 · 2014-03-18 15:52:07 +08:00 · 7a16ffff84
parent 2fd3e3df65 76abe8d1c9
commit 7a16ffff84
2 changed files with 2 additions and 2 deletions
--- a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp
+++ b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp
@ -293,7 +293,7 @@ string FileUtilsWin32::getWritablePath() const
                // Create directory
                if (SUCCEEDED(SHCreateDirectoryExA(NULL, ret.c_str(), NULL)))
                {
-                    return ret;
+                    return convertPathFormatToUnixStyle(ret);
                }
            }
        }
--- a/tools/bindings-generator
+++ b/tools/bindings-generator
@ -1 +1 @@
-Subproject commit 34dfbf64971a955995fe9762ab33ddbf907a1be3
+Subproject commit 3b7246e9d86f52f7391de614cfce506cc105baa2