From 309422f791bcff95e8575b3975c55fd54bbaa8aa Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Tue, 18 Mar 2014 10:36:37 +0800 Subject: [PATCH 1/2] update `bindings-generator` submodule --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 34dfbf6497..3b7246e9d8 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 34dfbf64971a955995fe9762ab33ddbf907a1be3 +Subproject commit 3b7246e9d86f52f7391de614cfce506cc105baa2 From 76abe8d1c9b8806acc4f4cbae29390548f2ccb4b Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Tue, 18 Mar 2014 10:51:07 +0800 Subject: [PATCH 2/2] make FileUtilsWin32::getWritablePath() return value unified whether release or debug --- cocos/2d/platform/win32/CCFileUtilsWin32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp index 8b93969262..ee9b632ede 100644 --- 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); } } }