Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

V3 Win10 UWP fixes
This commit is contained in:
pandamicro 2015-09-22 01:57:53 +08:00
parent 49f6a863ea 70e157a44a
commit deacab9222
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
View File

@ -565,7 +565,6 @@
<ClCompile Include="..\..\physics3d\CCPhysics3DShape.cpp" /> <ClCompile Include="..\..\physics3d\CCPhysics3DShape.cpp" />
<ClCompile Include="..\..\physics3d\CCPhysics3DWorld.cpp" /> <ClCompile Include="..\..\physics3d\CCPhysics3DWorld.cpp" />
<ClCompile Include="..\..\physics3d\CCPhysicsSprite3D.cpp" /> <ClCompile Include="..\..\physics3d\CCPhysicsSprite3D.cpp" />
<ClCompile Include="..\..\physics\CCComponentPhysics2d.cpp" />
<ClCompile Include="..\..\physics\CCPhysicsBody.cpp" /> <ClCompile Include="..\..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\..\physics\CCPhysicsContact.cpp" /> <ClCompile Include="..\..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\..\physics\CCPhysicsJoint.cpp" /> <ClCompile Include="..\..\physics\CCPhysicsJoint.cpp" />
@ -1181,7 +1180,6 @@
<ClInclude Include="..\..\physics3d\CCPhysics3DShape.h" /> <ClInclude Include="..\..\physics3d\CCPhysics3DShape.h" />
<ClInclude Include="..\..\physics3d\CCPhysics3DWorld.h" /> <ClInclude Include="..\..\physics3d\CCPhysics3DWorld.h" />
<ClInclude Include="..\..\physics3d\CCPhysicsSprite3D.h" /> <ClInclude Include="..\..\physics3d\CCPhysicsSprite3D.h" />
<ClInclude Include="..\..\physics\CCComponentPhysics2d.h" />
<ClInclude Include="..\..\physics\CCPhysicsBody.h" /> <ClInclude Include="..\..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\..\physics\CCPhysicsContact.h" /> <ClInclude Include="..\..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\..\physics\CCPhysicsHelper.h" /> <ClInclude Include="..\..\physics\CCPhysicsHelper.h" />

6
cocos/2d/libcocos2d_win10/libcocos2d.vcxproj.filters
View File

@ -1578,9 +1578,6 @@
<ClCompile Include="..\..\network\WebSocket.cpp"> <ClCompile Include="..\..\network\WebSocket.cpp">
<Filter>network</Filter> <Filter>network</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\physics\CCComponentPhysics2d.cpp">
<Filter>physics</Filter>
</ClCompile>
<ClCompile Include="..\..\physics\CCPhysicsBody.cpp"> <ClCompile Include="..\..\physics\CCPhysicsBody.cpp">
<Filter>physics</Filter> <Filter>physics</Filter>
</ClCompile> </ClCompile>
@ -3395,9 +3392,6 @@
<ClInclude Include="..\..\network\WebSocket.h"> <ClInclude Include="..\..\network\WebSocket.h">
<Filter>network</Filter> <Filter>network</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\physics\CCComponentPhysics2d.h">
<Filter>physics</Filter>
</ClInclude>
<ClInclude Include="..\..\physics\CCPhysicsBody.h"> <ClInclude Include="..\..\physics\CCPhysicsBody.h">
<Filter>physics</Filter> <Filter>physics</Filter>
</ClInclude> </ClInclude>

1
cocos/platform/winrt/CCWinRTUtils.cpp
View File

@ -59,6 +59,7 @@ bool isWindowsPhone()
#else #else
return false; return false;
#endif #endif
return false;
} }
CC_DEPRECATED_ATTRIBUTE std::wstring CC_DLL CCUtf8ToUnicode(const char * pszUtf8Str, unsigned len /*= -1*/) CC_DEPRECATED_ATTRIBUTE std::wstring CC_DLL CCUtf8ToUnicode(const char * pszUtf8Str, unsigned len /*= -1*/)