Skip to content

V3: Windows 10.0 Universal App (UWP) dependencies #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 30, 2015
Merged

V3: Windows 10.0 Universal App (UWP) dependencies #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dfa597c
added Windows 10 Universal App project files
stammen May 26, 2015
1157ec7
added Windows 10 UWP project files
stammen May 27, 2015
19419b3
added Windows 10 Angle and zlib
stammen May 27, 2015
23a8997
added Windows 10 sqlite3
stammen May 27, 2015
100dc9e
Merge branch 'v3' into v3-win10
stammen May 28, 2015
7090331
added check for _M_ARM
stammen May 28, 2015
425d6c0
updated build properties
stammen May 28, 2015
9c1f153
Merge branch 'v3-win10' of github.com:MSOpenTech/cocos2d-x-3rd-party-…
stammen May 28, 2015
9397f94
disabled LTCG
stammen May 28, 2015
b1e8bb1
added windows 10 UWP libs
stammen May 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
313 changes: 313 additions & 0 deletions Box2D/proj-win10/libbox2d.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

311 changes: 311 additions & 0 deletions Box2D/proj-win10/libbox2d.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,311 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Collision">
<UniqueIdentifier>{65991f1d-83cc-48dd-9f41-b3c02b4b7654}</UniqueIdentifier>
</Filter>
<Filter Include="Common">
<UniqueIdentifier>{b7f5feeb-96a6-43bd-b120-bba8db88ccec}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics">
<UniqueIdentifier>{ad54425f-86e3-4dfd-9e38-beca59fbebc7}</UniqueIdentifier>
</Filter>
<Filter Include="Rope">
<UniqueIdentifier>{b6deb922-f2a0-4925-80dd-c3dd97884a7f}</UniqueIdentifier>
</Filter>
<Filter Include="Collision\Shapes">
<UniqueIdentifier>{00d84ab3-608b-46d0-be7d-d7c13701fe48}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Contacts">
<UniqueIdentifier>{d3c3f910-f207-40dd-a42a-984c5277aca7}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Joints">
<UniqueIdentifier>{54a1f56b-5461-4149-b2eb-0340a1279822}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Collision\Shapes\b2ChainShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\Collision\Shapes\b2CircleShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\Collision\Shapes\b2EdgeShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\Collision\Shapes\b2PolygonShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2BroadPhase.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2CollideCircle.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2CollideEdge.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2CollidePolygon.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2Collision.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2Distance.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2DynamicTree.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Collision\b2TimeOfImpact.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2BlockAllocator.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2Draw.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2Math.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2Settings.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2StackAllocator.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Common\b2Timer.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2CircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2Contact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2ContactSolver.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Contacts\b2PolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2DistanceJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2FrictionJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2GearJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2Joint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2MouseJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2PrismaticJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2PulleyJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2RevoluteJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2RopeJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2WeldJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2WheelJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2Body.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2ContactManager.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2Fixture.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2Island.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2World.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\b2WorldCallbacks.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\Rope\b2Rope.cpp">
<Filter>Rope</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Collision\Shapes\b2ChainShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\Collision\Shapes\b2CircleShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\Collision\Shapes\b2EdgeShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\Collision\Shapes\b2PolygonShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\Collision\Shapes\b2Shape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\Collision\b2BroadPhase.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\Collision\b2Collision.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\Collision\b2Distance.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\Collision\b2DynamicTree.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\Collision\b2TimeOfImpact.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2BlockAllocator.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2Draw.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2GrowableStack.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2Math.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2Settings.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2StackAllocator.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Common\b2Timer.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2CircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2Contact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2ContactSolver.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Contacts\b2PolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2DistanceJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2FrictionJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2GearJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2Joint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2MouseJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2PrismaticJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2PulleyJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2RevoluteJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2RopeJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2WeldJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2WheelJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2Body.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2ContactManager.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2Fixture.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2Island.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2TimeStep.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2World.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\b2WorldCallbacks.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\Rope\b2Rope.h">
<Filter>Rope</Filter>
</ClInclude>
<ClInclude Include="..\Box2D.h" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions bullet/BulletMultiThreaded/PlatformDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ typedef union
#ifndef __BT_SKIP_UINT64_H
#if defined(_WIN64) && defined(_MSC_VER)
typedef unsigned __int64 uint64_t;
#elif defined(_M_ARM)
typedef unsigned __int64 uint64_t;
#else
typedef unsigned long int uint64_t;
#endif
Expand Down
Loading