From 25537c610ef479c9e183ada9e3359f228197a8df Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 6 Sep 2016 19:23:59 +0200
Subject: [PATCH] build: fix Visual Studio projects

---
 src/3rdparty/lol-bullet.vcxproj | 968 ++++++++++++++++----------------
 src/3rdparty/lol-lua.vcxproj    | 120 ++--
 2 files changed, 544 insertions(+), 544 deletions(-)

diff --git a/src/3rdparty/lol-bullet.vcxproj b/src/3rdparty/lol-bullet.vcxproj
index 5c65706e..8535bca6 100644
--- a/src/3rdparty/lol-bullet.vcxproj
+++ b/src/3rdparty/lol-bullet.vcxproj
@@ -58,532 +58,532 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp" />
-    <ClCompile Include="Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp" />
-    <ClCompile Include="Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp" />
-    <ClCompile Include="Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp" />
-    <ClCompile Include="Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h" />
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h" />
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h" />
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h" />
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h" />
-    <ClInclude Include="Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3Config.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3Contact4.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h" />
-    <ClInclude Include="Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Config.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h" />
+    <ClInclude Include="bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bullet3Common/b3AlignedAllocator.cpp" />
-    <ClCompile Include="Bullet3Common/b3Logging.cpp" />
-    <ClCompile Include="Bullet3Common/b3Vector3.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Common/b3AlignedAllocator.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Common/b3Logging.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Common/b3Vector3.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bullet3Common/b3AlignedAllocator.h" />
-    <ClInclude Include="Bullet3Common/b3AlignedObjectArray.h" />
-    <ClInclude Include="Bullet3Common/b3CommandLineArgs.h" />
-    <ClInclude Include="Bullet3Common/b3FileUtils.h" />
-    <ClInclude Include="Bullet3Common/b3HashMap.h" />
-    <ClInclude Include="Bullet3Common/b3Logging.h" />
-    <ClInclude Include="Bullet3Common/b3Matrix3x3.h" />
-    <ClInclude Include="Bullet3Common/b3MinMax.h" />
-    <ClInclude Include="Bullet3Common/b3PoolAllocator.h" />
-    <ClInclude Include="Bullet3Common/b3QuadWord.h" />
-    <ClInclude Include="Bullet3Common/b3Quaternion.h" />
-    <ClInclude Include="Bullet3Common/b3Random.h" />
-    <ClInclude Include="Bullet3Common/b3Scalar.h" />
-    <ClInclude Include="Bullet3Common/b3StackAlloc.h" />
-    <ClInclude Include="Bullet3Common/b3Transform.h" />
-    <ClInclude Include="Bullet3Common/b3TransformUtil.h" />
-    <ClInclude Include="Bullet3Common/b3Vector3.h" />
-    <ClInclude Include="Bullet3Common/shared/b3Float4.h" />
-    <ClInclude Include="Bullet3Common/shared/b3Int2.h" />
-    <ClInclude Include="Bullet3Common/shared/b3Int4.h" />
-    <ClInclude Include="Bullet3Common/shared/b3Mat3x3.h" />
-    <ClInclude Include="Bullet3Common/shared/b3PlatformDefinitions.h" />
-    <ClInclude Include="Bullet3Common/shared/b3Quat.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3AlignedAllocator.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3AlignedObjectArray.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3CommandLineArgs.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3FileUtils.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3HashMap.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Logging.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Matrix3x3.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3MinMax.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3PoolAllocator.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3QuadWord.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Quaternion.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Random.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Scalar.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3StackAlloc.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Transform.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3TransformUtil.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/b3Vector3.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3Float4.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3Int2.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3Int4.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3Mat3x3.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3PlatformDefinitions.h" />
+    <ClInclude Include="bullet3/src/Bullet3Common/shared/b3Quat.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp" />
-    <ClCompile Include="Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp" />
-    <ClCompile Include="Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp" />
-    <ClCompile Include="Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp" />
-    <ClCompile Include="Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp" />
-    <ClCompile Include="Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bullet3Dynamics/b3CpuRigidBodyPipeline.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3SolverBody.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h" />
-    <ClInclude Include="Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h" />
-    <ClInclude Include="Bullet3Dynamics/shared/b3ContactConstraint4.h" />
-    <ClInclude Include="Bullet3Dynamics/shared/b3ConvertConstraint4.h" />
-    <ClInclude Include="Bullet3Dynamics/shared/b3Inertia.h" />
-    <ClInclude Include="Bullet3Dynamics/shared/b3IntegrateTransforms.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/shared/b3ContactConstraint4.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/shared/b3ConvertConstraint4.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/shared/b3Inertia.h" />
+    <ClInclude Include="bullet3/src/Bullet3Dynamics/shared/b3IntegrateTransforms.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bullet3Geometry/b3ConvexHullComputer.cpp" />
-    <ClCompile Include="Bullet3Geometry/b3GeometryUtil.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Geometry/b3ConvexHullComputer.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Geometry/b3GeometryUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bullet3Geometry/b3AabbUtil.h" />
-    <ClInclude Include="Bullet3Geometry/b3ConvexHullComputer.h" />
-    <ClInclude Include="Bullet3Geometry/b3GeometryUtil.h" />
-    <ClInclude Include="Bullet3Geometry/b3GrahamScan2dConvexHull.h" />
+    <ClInclude Include="bullet3/src/Bullet3Geometry/b3AabbUtil.h" />
+    <ClInclude Include="bullet3/src/Bullet3Geometry/b3ConvexHullComputer.h" />
+    <ClInclude Include="bullet3/src/Bullet3Geometry/b3GeometryUtil.h" />
+    <ClInclude Include="bullet3/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp" />
-    <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp" />
-    <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp" />
-    <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3File.cpp" />
-    <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp" />
+    <ClCompile Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3Chunk.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3Common.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3Defines.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3DNA.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3File.h" />
-    <ClInclude Include="Bullet3Serialize/Bullet2FileLoader/b3Serializer.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Common.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Defines.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.h" />
+    <ClInclude Include="bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btAxisSweep3.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btDbvt.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btDispatcher.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp" />
-    <ClCompile Include="BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCollisionObject.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCollisionWorld.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btGhostObject.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btManifoldResult.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/btUnionFind.cpp" />
-    <ClCompile Include="BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btBox2dShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btBoxShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btCapsuleShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btCollisionShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btCompoundShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConcaveShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConeShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvex2dShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexHullShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexInternalShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexPolyhedron.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btCylinderShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btEmptyShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btMultiSphereShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btOptimizedBvh.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btShapeHull.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btSphereShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btStaticPlaneShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btStridingMeshInterface.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTetrahedronShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleBuffer.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleCallback.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleMesh.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btTriangleMeshShape.cpp" />
-    <ClCompile Include="BulletCollision/CollisionShapes/btUniformScalingShape.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btContactProcessing.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btGenericPoolAllocator.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btGImpactBvh.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btGImpactShape.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/btTriangleShapeEx.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/gim_box_set.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/gim_contact.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/gim_memory.cpp" />
-    <ClCompile Include="BulletCollision/Gimpact/gim_tri_collision.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btConvexCast.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp" />
-    <ClCompile Include="BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConeShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btContactProcessing.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btGImpactBvh.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btGImpactShape.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/gim_box_set.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/gim_contact.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/gim_memory.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/Gimpact/gim_tri_collision.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp" />
+    <ClCompile Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btAxisSweep3.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btDbvtBroadphase.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btDbvt.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btDispatcher.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btQuantizedBvh.h" />
-    <ClInclude Include="BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btBoxBoxDetector.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionConfiguration.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionDispatcher.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionObject.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionWorld.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCollisionWorldImporter.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btGhostObject.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btHashedSimplePairCache.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btInternalEdgeUtility.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btManifoldResult.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btSimulationIslandManager.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/btUnionFind.h" />
-    <ClInclude Include="BulletCollision/CollisionDispatch/SphereTriangleDetector.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btBox2dShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btBoxShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btCapsuleShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btCollisionMargin.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btCollisionShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btCompoundShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConcaveShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConeShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvex2dShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexHullShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexInternalShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexPointCloudShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexPolyhedron.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btCylinderShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btEmptyShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btMaterial.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btMinkowskiSumShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btMultiSphereShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btOptimizedBvh.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btShapeHull.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btSphereShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btStaticPlaneShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btStridingMeshInterface.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTetrahedronShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleBuffer.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleCallback.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleInfoMap.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleMesh.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleMeshShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btTriangleShape.h" />
-    <ClInclude Include="BulletCollision/CollisionShapes/btUniformScalingShape.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btBoxCollision.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btClipPolygon.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btCompoundFromGimpact.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btContactProcessing.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGenericPoolAllocator.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGeometryOperations.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGImpactBvh.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGImpactMassUtil.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGImpactQuantizedBvh.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btGImpactShape.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btQuantization.h" />
-    <ClInclude Include="BulletCollision/Gimpact/btTriangleShapeEx.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_array.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_basic_geometry_operations.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_bitset.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_box_collision.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_box_set.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_clip_polygon.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_contact.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_geometry.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_geom_types.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_hash_table.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_linear_math.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_math.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_memory.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_radixsort.h" />
-    <ClInclude Include="BulletCollision/Gimpact/gim_tri_collision.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btConvexCast.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkEpa3.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btMprPenetration.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btPointCollector.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btRaycastCallback.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" />
-    <ClInclude Include="BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btCollisionMargin.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConeShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMaterial.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btSphereShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btTriangleShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btBoxCollision.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btClipPolygon.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btCompoundFromGimpact.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btContactProcessing.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGeometryOperations.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGImpactBvh.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGImpactMassUtil.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btGImpactShape.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btQuantization.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_array.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_bitset.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_box_collision.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_box_set.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_clip_polygon.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_contact.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_geometry.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_geom_types.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_hash_table.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_linear_math.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_math.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_memory.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_radixsort.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/Gimpact/gim_tri_collision.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" />
+    <ClInclude Include="bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BulletDynamics/Character/btKinematicCharacterController.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btContactConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btFixedConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btGearConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btHingeConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btSliderConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btTypedConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp" />
-    <ClCompile Include="BulletDynamics/Dynamics/btRigidBody.cpp" />
-    <ClCompile Include="BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBody.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp" />
-    <ClCompile Include="BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp" />
-    <ClCompile Include="BulletDynamics/MLCPSolvers/btDantzigLCP.cpp" />
-    <ClCompile Include="BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp" />
-    <ClCompile Include="BulletDynamics/MLCPSolvers/btMLCPSolver.cpp" />
-    <ClCompile Include="BulletDynamics/Vehicle/btRaycastVehicle.cpp" />
-    <ClCompile Include="BulletDynamics/Vehicle/btWheelInfo.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Dynamics/btRigidBody.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBody.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp" />
+    <ClCompile Include="bullet3/src/BulletDynamics/Vehicle/btWheelInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BulletDynamics/Character/btCharacterControllerInterface.h" />
-    <ClInclude Include="BulletDynamics/Character/btKinematicCharacterController.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btConstraintSolver.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btContactConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btContactSolverInfo.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btFixedConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btGearConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btHinge2Constraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btHingeConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btJacobianEntry.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btSliderConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btSolverBody.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btSolverConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btTypedConstraint.h" />
-    <ClInclude Include="BulletDynamics/ConstraintSolver/btUniversalConstraint.h" />
-    <ClInclude Include="BulletDynamics/Dynamics/btActionInterface.h" />
-    <ClInclude Include="BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" />
-    <ClInclude Include="BulletDynamics/Dynamics/btDynamicsWorld.h" />
-    <ClInclude Include="BulletDynamics/Dynamics/btRigidBody.h" />
-    <ClInclude Include="BulletDynamics/Dynamics/btSimpleDynamicsWorld.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyConstraint.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBody.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyJointFeedback.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyJointMotor.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyLinkCollider.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyLink.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodyPoint2Point.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodySliderConstraint.h" />
-    <ClInclude Include="BulletDynamics/Featherstone/btMultiBodySolverConstraint.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btDantzigLCP.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btDantzigSolver.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btLemkeSolver.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btMLCPSolver.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btPATHSolver.h" />
-    <ClInclude Include="BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h" />
-    <ClInclude Include="BulletDynamics/Vehicle/btRaycastVehicle.h" />
-    <ClInclude Include="BulletDynamics/Vehicle/btVehicleRaycaster.h" />
-    <ClInclude Include="BulletDynamics/Vehicle/btWheelInfo.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSolverBody.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Dynamics/btActionInterface.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Dynamics/btDynamicsWorld.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Dynamics/btRigidBody.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBody.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyLink.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btPATHSolver.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Vehicle/btVehicleRaycaster.h" />
+    <ClInclude Include="bullet3/src/BulletDynamics/Vehicle/btWheelInfo.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeImpl.cpp" />
-    <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp" />
-    <ClCompile Include="BulletInverseDynamics/IDMath.cpp" />
-    <ClCompile Include="BulletInverseDynamics/MultiBodyTree.cpp" />
+    <ClCompile Include="bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp" />
+    <ClCompile Include="bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp" />
+    <ClCompile Include="bullet3/src/BulletInverseDynamics/IDMath.cpp" />
+    <ClCompile Include="bullet3/src/BulletInverseDynamics/MultiBodyTree.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BulletInverseDynamics/details/IDEigenInterface.hpp" />
-    <ClInclude Include="BulletInverseDynamics/details/IDLinearMathInterface.hpp" />
-    <ClInclude Include="BulletInverseDynamics/details/IDMatVec.hpp" />
-    <ClInclude Include="BulletInverseDynamics/details/MultiBodyTreeImpl.hpp" />
-    <ClInclude Include="BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp" />
-    <ClInclude Include="BulletInverseDynamics/IDConfigBuiltin.hpp" />
-    <ClInclude Include="BulletInverseDynamics/IDConfigEigen.hpp" />
-    <ClInclude Include="BulletInverseDynamics/IDConfig.hpp" />
-    <ClInclude Include="BulletInverseDynamics/IDErrorMessages.hpp" />
-    <ClInclude Include="BulletInverseDynamics/IDMath.hpp" />
-    <ClInclude Include="BulletInverseDynamics/MultiBodyTree.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/details/IDEigenInterface.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/details/IDMatVec.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/IDConfigBuiltin.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/IDConfigEigen.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/IDConfig.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/IDErrorMessages.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/IDMath.hpp" />
+    <ClInclude Include="bullet3/src/BulletInverseDynamics/MultiBodyTree.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BulletSoftBody/btDefaultSoftBodySolver.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftBody.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftBodyHelpers.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftRigidDynamicsWorld.cpp" />
-    <ClCompile Include="BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftBody.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftBodyHelpers.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp" />
+    <ClCompile Include="bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BulletSoftBody/btDefaultSoftBodySolver.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodyData.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBody.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodyHelpers.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodyInternals.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodySolvers.h" />
-    <ClInclude Include="BulletSoftBody/btSoftBodySolverVertexBuffer.h" />
-    <ClInclude Include="BulletSoftBody/btSoftRigidCollisionAlgorithm.h" />
-    <ClInclude Include="BulletSoftBody/btSoftRigidDynamicsWorld.h" />
-    <ClInclude Include="BulletSoftBody/btSoftSoftCollisionAlgorithm.h" />
-    <ClInclude Include="BulletSoftBody/btSparseSDF.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodyData.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBody.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodyHelpers.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodyInternals.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodySolvers.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h" />
+    <ClInclude Include="bullet3/src/BulletSoftBody/btSparseSDF.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="clew/clew.c" />
+    <ClCompile Include="bullet3/src/clew/clew.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="clew/clew.h" />
+    <ClInclude Include="bullet3/src/clew/clew.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="LinearMath/btAlignedAllocator.cpp" />
-    <ClCompile Include="LinearMath/btConvexHullComputer.cpp" />
-    <ClCompile Include="LinearMath/btConvexHull.cpp" />
-    <ClCompile Include="LinearMath/btGeometryUtil.cpp" />
-    <ClCompile Include="LinearMath/btPolarDecomposition.cpp" />
-    <ClCompile Include="LinearMath/btQuickprof.cpp" />
-    <ClCompile Include="LinearMath/btSerializer.cpp" />
-    <ClCompile Include="LinearMath/btVector3.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btAlignedAllocator.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btConvexHullComputer.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btConvexHull.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btGeometryUtil.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btPolarDecomposition.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btQuickprof.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btSerializer.cpp" />
+    <ClCompile Include="bullet3/src/LinearMath/btVector3.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="LinearMath/btAabbUtil2.h" />
-    <ClInclude Include="LinearMath/btAlignedAllocator.h" />
-    <ClInclude Include="LinearMath/btAlignedObjectArray.h" />
-    <ClInclude Include="LinearMath/btConvexHullComputer.h" />
-    <ClInclude Include="LinearMath/btConvexHull.h" />
-    <ClInclude Include="LinearMath/btCpuFeatureUtility.h" />
-    <ClInclude Include="LinearMath/btDefaultMotionState.h" />
-    <ClInclude Include="LinearMath/btGeometryUtil.h" />
-    <ClInclude Include="LinearMath/btGrahamScan2dConvexHull.h" />
-    <ClInclude Include="LinearMath/btHashMap.h" />
-    <ClInclude Include="LinearMath/btIDebugDraw.h" />
-    <ClInclude Include="LinearMath/btList.h" />
-    <ClInclude Include="LinearMath/btMatrix3x3.h" />
-    <ClInclude Include="LinearMath/btMatrixX.h" />
-    <ClInclude Include="LinearMath/btMinMax.h" />
-    <ClInclude Include="LinearMath/btMotionState.h" />
-    <ClInclude Include="LinearMath/btPolarDecomposition.h" />
-    <ClInclude Include="LinearMath/btPoolAllocator.h" />
-    <ClInclude Include="LinearMath/btQuadWord.h" />
-    <ClInclude Include="LinearMath/btQuaternion.h" />
-    <ClInclude Include="LinearMath/btQuickprof.h" />
-    <ClInclude Include="LinearMath/btRandom.h" />
-    <ClInclude Include="LinearMath/btScalar.h" />
-    <ClInclude Include="LinearMath/btSerializer.h" />
-    <ClInclude Include="LinearMath/btSpatialAlgebra.h" />
-    <ClInclude Include="LinearMath/btStackAlloc.h" />
-    <ClInclude Include="LinearMath/btTransform.h" />
-    <ClInclude Include="LinearMath/btTransformUtil.h" />
-    <ClInclude Include="LinearMath/btVector3.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btAabbUtil2.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btAlignedAllocator.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btAlignedObjectArray.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btConvexHullComputer.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btConvexHull.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btCpuFeatureUtility.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btDefaultMotionState.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btGeometryUtil.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btGrahamScan2dConvexHull.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btHashMap.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btIDebugDraw.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btList.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btMatrix3x3.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btMatrixX.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btMinMax.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btMotionState.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btPolarDecomposition.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btPoolAllocator.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btQuadWord.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btQuaternion.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btQuickprof.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btRandom.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btScalar.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btSerializer.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btSpatialAlgebra.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btStackAlloc.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btTransform.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btTransformUtil.h" />
+    <ClInclude Include="bullet3/src/LinearMath/btVector3.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/3rdparty/lol-lua.vcxproj b/src/3rdparty/lol-lua.vcxproj
index 984f905e..8f574c24 100644
--- a/src/3rdparty/lol-lua.vcxproj
+++ b/src/3rdparty/lol-lua.vcxproj
@@ -58,68 +58,68 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="lapi.c" />
-    <ClCompile Include="lauxlib.c" />
-    <ClCompile Include="lbaselib.c" />
-    <ClCompile Include="lbitlib.c" />
-    <ClCompile Include="lcode.c" />
-    <ClCompile Include="lcorolib.c" />
-    <ClCompile Include="lctype.c" />
-    <ClCompile Include="ldblib.c" />
-    <ClCompile Include="ldebug.c" />
-    <ClCompile Include="ldo.c" />
-    <ClCompile Include="ldump.c" />
-    <ClCompile Include="lfunc.c" />
-    <ClCompile Include="lgc.c" />
-    <ClCompile Include="linit.c" />
-    <ClCompile Include="liolib.c" />
-    <ClCompile Include="llex.c" />
-    <ClCompile Include="lmathlib.c" />
-    <ClCompile Include="lmem.c" />
-    <ClCompile Include="loadlib.c" />
-    <ClCompile Include="lobject.c" />
-    <ClCompile Include="lopcodes.c" />
-    <ClCompile Include="loslib.c" />
-    <ClCompile Include="lparser.c" />
-    <ClCompile Include="lstate.c" />
-    <ClCompile Include="lstring.c" />
-    <ClCompile Include="lstrlib.c" />
-    <ClCompile Include="ltable.c" />
-    <ClCompile Include="ltablib.c" />
-    <ClCompile Include="ltm.c" />
-    <ClCompile Include="lutf8lib.c" />
-    <ClCompile Include="lundump.c" />
-    <ClCompile Include="lvm.c" />
-    <ClCompile Include="lzio.c" />
+    <ClCompile Include="lua/src/lapi.c" />
+    <ClCompile Include="lua/src/lauxlib.c" />
+    <ClCompile Include="lua/src/lbaselib.c" />
+    <ClCompile Include="lua/src/lbitlib.c" />
+    <ClCompile Include="lua/src/lcode.c" />
+    <ClCompile Include="lua/src/lcorolib.c" />
+    <ClCompile Include="lua/src/lctype.c" />
+    <ClCompile Include="lua/src/ldblib.c" />
+    <ClCompile Include="lua/src/ldebug.c" />
+    <ClCompile Include="lua/src/ldo.c" />
+    <ClCompile Include="lua/src/ldump.c" />
+    <ClCompile Include="lua/src/lfunc.c" />
+    <ClCompile Include="lua/src/lgc.c" />
+    <ClCompile Include="lua/src/linit.c" />
+    <ClCompile Include="lua/src/liolib.c" />
+    <ClCompile Include="lua/src/llex.c" />
+    <ClCompile Include="lua/src/lmathlib.c" />
+    <ClCompile Include="lua/src/lmem.c" />
+    <ClCompile Include="lua/src/loadlib.c" />
+    <ClCompile Include="lua/src/lobject.c" />
+    <ClCompile Include="lua/src/lopcodes.c" />
+    <ClCompile Include="lua/src/loslib.c" />
+    <ClCompile Include="lua/src/lparser.c" />
+    <ClCompile Include="lua/src/lstate.c" />
+    <ClCompile Include="lua/src/lstring.c" />
+    <ClCompile Include="lua/src/lstrlib.c" />
+    <ClCompile Include="lua/src/ltable.c" />
+    <ClCompile Include="lua/src/ltablib.c" />
+    <ClCompile Include="lua/src/ltm.c" />
+    <ClCompile Include="lua/src/lutf8lib.c" />
+    <ClCompile Include="lua/src/lundump.c" />
+    <ClCompile Include="lua/src/lvm.c" />
+    <ClCompile Include="lua/src/lzio.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="lapi.h" />
-    <ClInclude Include="lauxlib.h" />
-    <ClInclude Include="lcode.h" />
-    <ClInclude Include="lctype.h" />
-    <ClInclude Include="ldebug.h" />
-    <ClInclude Include="ldo.h" />
-    <ClInclude Include="lfunc.h" />
-    <ClInclude Include="lgc.h" />
-    <ClInclude Include="llex.h" />
-    <ClInclude Include="llimits.h" />
-    <ClInclude Include="lmem.h" />
-    <ClInclude Include="lobject.h" />
-    <ClInclude Include="lopcodes.h" />
-    <ClInclude Include="lparser.h" />
-    <ClInclude Include="lprefix.h" />
-    <ClInclude Include="lstate.h" />
-    <ClInclude Include="lstring.h" />
-    <ClInclude Include="ltable.h" />
-    <ClInclude Include="ltm.h" />
-    <ClInclude Include="luaconf.h" />
-    <ClInclude Include="lua.h" />
-    <ClInclude Include="lua.hpp" />
-    <ClInclude Include="lualib.h" />
-    <ClInclude Include="luawrapper.hpp" />
-    <ClInclude Include="lundump.h" />
-    <ClInclude Include="lvm.h" />
-    <ClInclude Include="lzio.h" />
+    <ClInclude Include="lua/src/lapi.h" />
+    <ClInclude Include="lua/src/lauxlib.h" />
+    <ClInclude Include="lua/src/lcode.h" />
+    <ClInclude Include="lua/src/lctype.h" />
+    <ClInclude Include="lua/src/ldebug.h" />
+    <ClInclude Include="lua/src/ldo.h" />
+    <ClInclude Include="lua/src/lfunc.h" />
+    <ClInclude Include="lua/src/lgc.h" />
+    <ClInclude Include="lua/src/llex.h" />
+    <ClInclude Include="lua/src/llimits.h" />
+    <ClInclude Include="lua/src/lmem.h" />
+    <ClInclude Include="lua/src/lobject.h" />
+    <ClInclude Include="lua/src/lopcodes.h" />
+    <ClInclude Include="lua/src/lparser.h" />
+    <ClInclude Include="lua/src/lprefix.h" />
+    <ClInclude Include="lua/src/lstate.h" />
+    <ClInclude Include="lua/src/lstring.h" />
+    <ClInclude Include="lua/src/ltable.h" />
+    <ClInclude Include="lua/src/ltm.h" />
+    <ClInclude Include="lua/src/luaconf.h" />
+    <ClInclude Include="lua/src/lua.h" />
+    <ClInclude Include="lua/src/lua.hpp" />
+    <ClInclude Include="lua/src/lualib.h" />
+    <ClInclude Include="lua/src/luawrapper.hpp" />
+    <ClInclude Include="lua/src/lundump.h" />
+    <ClInclude Include="lua/src/lvm.h" />
+    <ClInclude Include="lua/src/lzio.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am">