Merge pull request cocos2d#13990 from MSOpenTech/v3-win10-fix

V3 Win10 UWP fixes
fumingxing2015 · Sep 21, 2015 · deacab9 · deacab9
2 parents 49f6a86 + 70e157a
commit deacab9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
@@ -565,7 +565,6 @@
     <ClCompile Include="..\..\physics3d\CCPhysics3DShape.cpp" />
     <ClCompile Include="..\..\physics3d\CCPhysics3DWorld.cpp" />
     <ClCompile Include="..\..\physics3d\CCPhysicsSprite3D.cpp" />
-    <ClCompile Include="..\..\physics\CCComponentPhysics2d.cpp" />
     <ClCompile Include="..\..\physics\CCPhysicsBody.cpp" />
     <ClCompile Include="..\..\physics\CCPhysicsContact.cpp" />
     <ClCompile Include="..\..\physics\CCPhysicsJoint.cpp" />
@@ -1181,7 +1180,6 @@
     <ClInclude Include="..\..\physics3d\CCPhysics3DShape.h" />
     <ClInclude Include="..\..\physics3d\CCPhysics3DWorld.h" />
     <ClInclude Include="..\..\physics3d\CCPhysicsSprite3D.h" />
-    <ClInclude Include="..\..\physics\CCComponentPhysics2d.h" />
     <ClInclude Include="..\..\physics\CCPhysicsBody.h" />
     <ClInclude Include="..\..\physics\CCPhysicsContact.h" />
     <ClInclude Include="..\..\physics\CCPhysicsHelper.h" />

diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters
@@ -1578,9 +1578,6 @@
     <ClCompile Include="..\..\network\WebSocket.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\physics\CCComponentPhysics2d.cpp">
-      <Filter>physics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\physics\CCPhysicsBody.cpp">
       <Filter>physics</Filter>
     </ClCompile>
@@ -3395,9 +3392,6 @@
     <ClInclude Include="..\..\network\WebSocket.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\physics\CCComponentPhysics2d.h">
-      <Filter>physics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\physics\CCPhysicsBody.h">
       <Filter>physics</Filter>
     </ClInclude>

diff --git 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*/)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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*/)
@@ Expand Down @@