Skip to content

Commit 0d032dc

Browse files
zilongshanrenzilongshanren
committed
Merge pull request #152 from MSOpenTech/v3-uwp
V3: Windows 10.0 Universal App (UWP) dependencies
2 parents 6569727 + b1e8bb1 commit 0d032dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+34078
-0
lines changed

‎Box2D/proj-win10/libbox2d.vcxproj

Lines changed: 313 additions & 0 deletions
Large diffs are not rendered by default.

‎Box2D/proj-win10/libbox2d.vcxproj.filters

Lines changed: 311 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,311 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Resource Files">
5+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
6+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
7+
</Filter>
8+
<Filter Include="Collision">
9+
<UniqueIdentifier>{65991f1d-83cc-48dd-9f41-b3c02b4b7654}</UniqueIdentifier>
10+
</Filter>
11+
<Filter Include="Common">
12+
<UniqueIdentifier>{b7f5feeb-96a6-43bd-b120-bba8db88ccec}</UniqueIdentifier>
13+
</Filter>
14+
<Filter Include="Dynamics">
15+
<UniqueIdentifier>{ad54425f-86e3-4dfd-9e38-beca59fbebc7}</UniqueIdentifier>
16+
</Filter>
17+
<Filter Include="Rope">
18+
<UniqueIdentifier>{b6deb922-f2a0-4925-80dd-c3dd97884a7f}</UniqueIdentifier>
19+
</Filter>
20+
<Filter Include="Collision\Shapes">
21+
<UniqueIdentifier>{00d84ab3-608b-46d0-be7d-d7c13701fe48}</UniqueIdentifier>
22+
</Filter>
23+
<Filter Include="Dynamics\Contacts">
24+
<UniqueIdentifier>{d3c3f910-f207-40dd-a42a-984c5277aca7}</UniqueIdentifier>
25+
</Filter>
26+
<Filter Include="Dynamics\Joints">
27+
<UniqueIdentifier>{54a1f56b-5461-4149-b2eb-0340a1279822}</UniqueIdentifier>
28+
</Filter>
29+
</ItemGroup>
30+
<ItemGroup>
31+
<ClCompile Include="..\Collision\Shapes\b2ChainShape.cpp">
32+
<Filter>Collision\Shapes</Filter>
33+
</ClCompile>
34+
<ClCompile Include="..\Collision\Shapes\b2CircleShape.cpp">
35+
<Filter>Collision\Shapes</Filter>
36+
</ClCompile>
37+
<ClCompile Include="..\Collision\Shapes\b2EdgeShape.cpp">
38+
<Filter>Collision\Shapes</Filter>
39+
</ClCompile>
40+
<ClCompile Include="..\Collision\Shapes\b2PolygonShape.cpp">
41+
<Filter>Collision\Shapes</Filter>
42+
</ClCompile>
43+
<ClCompile Include="..\Collision\b2BroadPhase.cpp">
44+
<Filter>Collision</Filter>
45+
</ClCompile>
46+
<ClCompile Include="..\Collision\b2CollideCircle.cpp">
47+
<Filter>Collision</Filter>
48+
</ClCompile>
49+
<ClCompile Include="..\Collision\b2CollideEdge.cpp">
50+
<Filter>Collision</Filter>
51+
</ClCompile>
52+
<ClCompile Include="..\Collision\b2CollidePolygon.cpp">
53+
<Filter>Collision</Filter>
54+
</ClCompile>
55+
<ClCompile Include="..\Collision\b2Collision.cpp">
56+
<Filter>Collision</Filter>
57+
</ClCompile>
58+
<ClCompile Include="..\Collision\b2Distance.cpp">
59+
<Filter>Collision</Filter>
60+
</ClCompile>
61+
<ClCompile Include="..\Collision\b2DynamicTree.cpp">
62+
<Filter>Collision</Filter>
63+
</ClCompile>
64+
<ClCompile Include="..\Collision\b2TimeOfImpact.cpp">
65+
<Filter>Collision</Filter>
66+
</ClCompile>
67+
<ClCompile Include="..\Common\b2BlockAllocator.cpp">
68+
<Filter>Common</Filter>
69+
</ClCompile>
70+
<ClCompile Include="..\Common\b2Draw.cpp">
71+
<Filter>Common</Filter>
72+
</ClCompile>
73+
<ClCompile Include="..\Common\b2Math.cpp">
74+
<Filter>Common</Filter>
75+
</ClCompile>
76+
<ClCompile Include="..\Common\b2Settings.cpp">
77+
<Filter>Common</Filter>
78+
</ClCompile>
79+
<ClCompile Include="..\Common\b2StackAllocator.cpp">
80+
<Filter>Common</Filter>
81+
</ClCompile>
82+
<ClCompile Include="..\Common\b2Timer.cpp">
83+
<Filter>Common</Filter>
84+
</ClCompile>
85+
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
86+
<Filter>Dynamics\Contacts</Filter>
87+
</ClCompile>
88+
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
89+
<Filter>Dynamics\Contacts</Filter>
90+
</ClCompile>
91+
<ClCompile Include="..\Dynamics\Contacts\b2CircleContact.cpp">
92+
<Filter>Dynamics\Contacts</Filter>
93+
</ClCompile>
94+
<ClCompile Include="..\Dynamics\Contacts\b2Contact.cpp">
95+
<Filter>Dynamics\Contacts</Filter>
96+
</ClCompile>
97+
<ClCompile Include="..\Dynamics\Contacts\b2ContactSolver.cpp">
98+
<Filter>Dynamics\Contacts</Filter>
99+
</ClCompile>
100+
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
101+
<Filter>Dynamics\Contacts</Filter>
102+
</ClCompile>
103+
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
104+
<Filter>Dynamics\Contacts</Filter>
105+
</ClCompile>
106+
<ClCompile Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
107+
<Filter>Dynamics\Contacts</Filter>
108+
</ClCompile>
109+
<ClCompile Include="..\Dynamics\Contacts\b2PolygonContact.cpp">
110+
<Filter>Dynamics\Contacts</Filter>
111+
</ClCompile>
112+
<ClCompile Include="..\Dynamics\Joints\b2DistanceJoint.cpp">
113+
<Filter>Dynamics\Joints</Filter>
114+
</ClCompile>
115+
<ClCompile Include="..\Dynamics\Joints\b2FrictionJoint.cpp">
116+
<Filter>Dynamics\Joints</Filter>
117+
</ClCompile>
118+
<ClCompile Include="..\Dynamics\Joints\b2GearJoint.cpp">
119+
<Filter>Dynamics\Joints</Filter>
120+
</ClCompile>
121+
<ClCompile Include="..\Dynamics\Joints\b2Joint.cpp">
122+
<Filter>Dynamics\Joints</Filter>
123+
</ClCompile>
124+
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp">
125+
<Filter>Dynamics\Joints</Filter>
126+
</ClCompile>
127+
<ClCompile Include="..\Dynamics\Joints\b2MouseJoint.cpp">
128+
<Filter>Dynamics\Joints</Filter>
129+
</ClCompile>
130+
<ClCompile Include="..\Dynamics\Joints\b2PrismaticJoint.cpp">
131+
<Filter>Dynamics\Joints</Filter>
132+
</ClCompile>
133+
<ClCompile Include="..\Dynamics\Joints\b2PulleyJoint.cpp">
134+
<Filter>Dynamics\Joints</Filter>
135+
</ClCompile>
136+
<ClCompile Include="..\Dynamics\Joints\b2RevoluteJoint.cpp">
137+
<Filter>Dynamics\Joints</Filter>
138+
</ClCompile>
139+
<ClCompile Include="..\Dynamics\Joints\b2RopeJoint.cpp">
140+
<Filter>Dynamics\Joints</Filter>
141+
</ClCompile>
142+
<ClCompile Include="..\Dynamics\Joints\b2WeldJoint.cpp">
143+
<Filter>Dynamics\Joints</Filter>
144+
</ClCompile>
145+
<ClCompile Include="..\Dynamics\Joints\b2WheelJoint.cpp">
146+
<Filter>Dynamics\Joints</Filter>
147+
</ClCompile>
148+
<ClCompile Include="..\Dynamics\b2Body.cpp">
149+
<Filter>Dynamics</Filter>
150+
</ClCompile>
151+
<ClCompile Include="..\Dynamics\b2ContactManager.cpp">
152+
<Filter>Dynamics</Filter>
153+
</ClCompile>
154+
<ClCompile Include="..\Dynamics\b2Fixture.cpp">
155+
<Filter>Dynamics</Filter>
156+
</ClCompile>
157+
<ClCompile Include="..\Dynamics\b2Island.cpp">
158+
<Filter>Dynamics</Filter>
159+
</ClCompile>
160+
<ClCompile Include="..\Dynamics\b2World.cpp">
161+
<Filter>Dynamics</Filter>
162+
</ClCompile>
163+
<ClCompile Include="..\Dynamics\b2WorldCallbacks.cpp">
164+
<Filter>Dynamics</Filter>
165+
</ClCompile>
166+
<ClCompile Include="..\Rope\b2Rope.cpp">
167+
<Filter>Rope</Filter>
168+
</ClCompile>
169+
</ItemGroup>
170+
<ItemGroup>
171+
<ClInclude Include="..\Collision\Shapes\b2ChainShape.h">
172+
<Filter>Collision\Shapes</Filter>
173+
</ClInclude>
174+
<ClInclude Include="..\Collision\Shapes\b2CircleShape.h">
175+
<Filter>Collision\Shapes</Filter>
176+
</ClInclude>
177+
<ClInclude Include="..\Collision\Shapes\b2EdgeShape.h">
178+
<Filter>Collision\Shapes</Filter>
179+
</ClInclude>
180+
<ClInclude Include="..\Collision\Shapes\b2PolygonShape.h">
181+
<Filter>Collision\Shapes</Filter>
182+
</ClInclude>
183+
<ClInclude Include="..\Collision\Shapes\b2Shape.h">
184+
<Filter>Collision\Shapes</Filter>
185+
</ClInclude>
186+
<ClInclude Include="..\Collision\b2BroadPhase.h">
187+
<Filter>Collision</Filter>
188+
</ClInclude>
189+
<ClInclude Include="..\Collision\b2Collision.h">
190+
<Filter>Collision</Filter>
191+
</ClInclude>
192+
<ClInclude Include="..\Collision\b2Distance.h">
193+
<Filter>Collision</Filter>
194+
</ClInclude>
195+
<ClInclude Include="..\Collision\b2DynamicTree.h">
196+
<Filter>Collision</Filter>
197+
</ClInclude>
198+
<ClInclude Include="..\Collision\b2TimeOfImpact.h">
199+
<Filter>Collision</Filter>
200+
</ClInclude>
201+
<ClInclude Include="..\Common\b2BlockAllocator.h">
202+
<Filter>Common</Filter>
203+
</ClInclude>
204+
<ClInclude Include="..\Common\b2Draw.h">
205+
<Filter>Common</Filter>
206+
</ClInclude>
207+
<ClInclude Include="..\Common\b2GrowableStack.h">
208+
<Filter>Common</Filter>
209+
</ClInclude>
210+
<ClInclude Include="..\Common\b2Math.h">
211+
<Filter>Common</Filter>
212+
</ClInclude>
213+
<ClInclude Include="..\Common\b2Settings.h">
214+
<Filter>Common</Filter>
215+
</ClInclude>
216+
<ClInclude Include="..\Common\b2StackAllocator.h">
217+
<Filter>Common</Filter>
218+
</ClInclude>
219+
<ClInclude Include="..\Common\b2Timer.h">
220+
<Filter>Common</Filter>
221+
</ClInclude>
222+
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndCircleContact.h">
223+
<Filter>Dynamics\Contacts</Filter>
224+
</ClInclude>
225+
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.h">
226+
<Filter>Dynamics\Contacts</Filter>
227+
</ClInclude>
228+
<ClInclude Include="..\Dynamics\Contacts\b2CircleContact.h">
229+
<Filter>Dynamics\Contacts</Filter>
230+
</ClInclude>
231+
<ClInclude Include="..\Dynamics\Contacts\b2Contact.h">
232+
<Filter>Dynamics\Contacts</Filter>
233+
</ClInclude>
234+
<ClInclude Include="..\Dynamics\Contacts\b2ContactSolver.h">
235+
<Filter>Dynamics\Contacts</Filter>
236+
</ClInclude>
237+
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.h">
238+
<Filter>Dynamics\Contacts</Filter>
239+
</ClInclude>
240+
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
241+
<Filter>Dynamics\Contacts</Filter>
242+
</ClInclude>
243+
<ClInclude Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.h">
244+
<Filter>Dynamics\Contacts</Filter>
245+
</ClInclude>
246+
<ClInclude Include="..\Dynamics\Contacts\b2PolygonContact.h">
247+
<Filter>Dynamics\Contacts</Filter>
248+
</ClInclude>
249+
<ClInclude Include="..\Dynamics\Joints\b2DistanceJoint.h">
250+
<Filter>Dynamics\Joints</Filter>
251+
</ClInclude>
252+
<ClInclude Include="..\Dynamics\Joints\b2FrictionJoint.h">
253+
<Filter>Dynamics\Joints</Filter>
254+
</ClInclude>
255+
<ClInclude Include="..\Dynamics\Joints\b2GearJoint.h">
256+
<Filter>Dynamics\Joints</Filter>
257+
</ClInclude>
258+
<ClInclude Include="..\Dynamics\Joints\b2Joint.h">
259+
<Filter>Dynamics\Joints</Filter>
260+
</ClInclude>
261+
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h">
262+
<Filter>Dynamics\Joints</Filter>
263+
</ClInclude>
264+
<ClInclude Include="..\Dynamics\Joints\b2MouseJoint.h">
265+
<Filter>Dynamics\Joints</Filter>
266+
</ClInclude>
267+
<ClInclude Include="..\Dynamics\Joints\b2PrismaticJoint.h">
268+
<Filter>Dynamics\Joints</Filter>
269+
</ClInclude>
270+
<ClInclude Include="..\Dynamics\Joints\b2PulleyJoint.h">
271+
<Filter>Dynamics\Joints</Filter>
272+
</ClInclude>
273+
<ClInclude Include="..\Dynamics\Joints\b2RevoluteJoint.h">
274+
<Filter>Dynamics\Joints</Filter>
275+
</ClInclude>
276+
<ClInclude Include="..\Dynamics\Joints\b2RopeJoint.h">
277+
<Filter>Dynamics\Joints</Filter>
278+
</ClInclude>
279+
<ClInclude Include="..\Dynamics\Joints\b2WeldJoint.h">
280+
<Filter>Dynamics\Joints</Filter>
281+
</ClInclude>
282+
<ClInclude Include="..\Dynamics\Joints\b2WheelJoint.h">
283+
<Filter>Dynamics\Joints</Filter>
284+
</ClInclude>
285+
<ClInclude Include="..\Dynamics\b2Body.h">
286+
<Filter>Dynamics</Filter>
287+
</ClInclude>
288+
<ClInclude Include="..\Dynamics\b2ContactManager.h">
289+
<Filter>Dynamics</Filter>
290+
</ClInclude>
291+
<ClInclude Include="..\Dynamics\b2Fixture.h">
292+
<Filter>Dynamics</Filter>
293+
</ClInclude>
294+
<ClInclude Include="..\Dynamics\b2Island.h">
295+
<Filter>Dynamics</Filter>
296+
</ClInclude>
297+
<ClInclude Include="..\Dynamics\b2TimeStep.h">
298+
<Filter>Dynamics</Filter>
299+
</ClInclude>
300+
<ClInclude Include="..\Dynamics\b2World.h">
301+
<Filter>Dynamics</Filter>
302+
</ClInclude>
303+
<ClInclude Include="..\Dynamics\b2WorldCallbacks.h">
304+
<Filter>Dynamics</Filter>
305+
</ClInclude>
306+
<ClInclude Include="..\Rope\b2Rope.h">
307+
<Filter>Rope</Filter>
308+
</ClInclude>
309+
<ClInclude Include="..\Box2D.h" />
310+
</ItemGroup>
311+
</Project>

‎bullet/BulletMultiThreaded/PlatformDefinitions.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ typedef union
4040
#ifndef __BT_SKIP_UINT64_H
4141
#if defined(_WIN64) && defined(_MSC_VER)
4242
typedef unsigned __int64 uint64_t;
43+
#elif defined(_M_ARM)
44+
typedef unsigned __int64 uint64_t;
4345
#else
4446
typedef unsigned long int uint64_t;
4547
#endif

0 commit comments

Comments
 (0)