From d5151952bb5b76f1ad438110422d3744fa58413f Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Mon, 21 Sep 2015 10:43:28 -0700 Subject: [PATCH 1/2] fixed compiler warning --- cocos/platform/winrt/CCWinRTUtils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/platform/winrt/CCWinRTUtils.cpp b/cocos/platform/winrt/CCWinRTUtils.cpp index b5ebbb64ec..3ba9d0c578 100644 --- a/cocos/platform/winrt/CCWinRTUtils.cpp +++ b/cocos/platform/winrt/CCWinRTUtils.cpp @@ -59,6 +59,7 @@ bool isWindowsPhone() #else return false; #endif + return false; } CC_DEPRECATED_ATTRIBUTE std::wstring CC_DLL CCUtf8ToUnicode(const char * pszUtf8Str, unsigned len /*= -1*/) From 70e157a44ae4496d224b24bbbc1da84c97ed3f3a Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Mon, 21 Sep 2015 10:44:30 -0700 Subject: [PATCH 2/2] removed CCComponentPhysics2d from Win10 UWP project --- cocos/2d/libcocos2d_win10/libcocos2d.vcxproj | 2 -- cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters | 6 ------ 2 files changed, 8 deletions(-) diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj index ad54fe8425..3cef125748 100644 --- a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj @@ -565,7 +565,6 @@ - @@ -1181,7 +1180,6 @@ - diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters index d2e1c62e5a..c37adca3cb 100644 --- a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters @@ -1578,9 +1578,6 @@ network - - physics - physics @@ -3395,9 +3392,6 @@ network - - physics - physics