diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-09-05 03:05:00 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-09-05 03:05:00 +0400 |
commit | d682dc5bd51ad2a2673bd0e93233a5ab6abbed55 (patch) | |
tree | b6ecd645dff67dcb92632f7a3a8161da703ae202 /extern/bullet2 | |
parent | 85deff9c30acb7f40108ef446ccaad7348a1a2c0 (diff) |
svn merge -c 16350 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'extern/bullet2')
-rw-r--r-- | extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj | 153 |
1 files changed, 153 insertions, 0 deletions
diff --git a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj index 6de2fd3a2bd..225a6ead3be 100644 --- a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj +++ b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj @@ -383,6 +383,36 @@ ECHO Done RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h"> </File> <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp"> </File> <File @@ -395,12 +425,30 @@ ECHO Done RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h"> </File> <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSliderConstraint.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSliderConstraint.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp"> </File> <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h"> </File> <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverBody.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp"> </File> <File @@ -411,6 +459,12 @@ ECHO Done Name="Dynamics" Filter=""> <File + RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp"> </File> <File @@ -483,18 +537,45 @@ ECHO Done RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvt.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvt.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvtBroadphase.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCallback.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btQuantizedBvh.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp"> </File> <File @@ -535,6 +616,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h"> </File> <File + RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp"> </File> <File @@ -590,6 +677,21 @@ ECHO Done Name="CollisionDispatch" Filter=""> <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h"> </File> <File @@ -629,6 +731,18 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp"> </File> <File @@ -732,6 +846,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp"> </File> <File @@ -762,12 +882,21 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMaterial.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultiSphereShape.cpp"> </File> <File @@ -786,6 +915,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btShapeHull.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btShapeHull.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btSphereShape.cpp"> </File> <File @@ -828,6 +963,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleMesh.cpp"> </File> <File @@ -842,6 +983,12 @@ ECHO Done <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleShape.h"> </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h"> + </File> </Filter> </Filter> <Filter @@ -860,6 +1007,9 @@ ECHO Done RelativePath="..\..\src\LinearMath\btAlignedObjectArray.h"> </File> <File + RelativePath="..\..\src\LinearMath\btConvexHull.h"> + </File> + <File RelativePath="..\..\src\LinearMath\btDefaultMotionState.h"> </File> <File @@ -887,6 +1037,9 @@ ECHO Done RelativePath="..\..\src\LinearMath\btPoint3.h"> </File> <File + RelativePath="..\..\src\LinearMath\btPoolAllocator.h"> + </File> + <File RelativePath="..\..\src\LinearMath\btQuadWord.h"> </File> <File |