From 17478eeb234676a28b45729d29eeb15fb6ac0328 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Sat, 13 Sep 2008 08:05:16 +0000
Subject: Update MSVC project file for latest Bullet revision. Remove compound
 patch as it is now included in Bullet trunk.

---
 extern/bullet2/bullet_compound_raycast.patch   | 39 --------------------------
 extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj | 39 --------------------------
 2 files changed, 78 deletions(-)
 delete mode 100644 extern/bullet2/bullet_compound_raycast.patch

(limited to 'extern/bullet2')

diff --git a/extern/bullet2/bullet_compound_raycast.patch b/extern/bullet2/bullet_compound_raycast.patch
deleted file mode 100644
index 2658f7ed56e..00000000000
--- a/extern/bullet2/bullet_compound_raycast.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
-===================================================================
---- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp	(r‚vision 16464)
-+++ src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp	(copie de travail)
-@@ -379,12 +379,16 @@
- 					btTransform childTrans = compoundShape->getChildTransform(i);
- 					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
- 					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+					// replace collision shape so that callback can determine the triangle
-+					btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+					collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
- 					rayTestSingle(rayFromTrans,rayToTrans,
- 						collisionObject,
- 						childCollisionShape,
- 						childWorldTrans,
- 						resultCallback);
--
-+					// restore
-+					collisionObject->setCollisionShape(saveCollisionShape);
- 				}
- 			}
- 		}
-@@ -571,11 +575,16 @@
- 					btTransform childTrans = compoundShape->getChildTransform(i);
- 					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
- 					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+					// replace collision shape so that callback can determine the triangle
-+					btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+					collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
- 					objectQuerySingle(castShape, convexFromTrans,convexToTrans,
- 						collisionObject,
- 						childCollisionShape,
- 						childWorldTrans,
- 						resultCallback, allowedPenetration);
-+					// restore
-+					collisionObject->setCollisionShape(saveCollisionShape);
- 				}
- 			}
- 		}
diff --git a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
index 225a6ead3be..186b03ad67d 100644
--- a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
+++ b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
@@ -382,36 +382,6 @@ ECHO Done
 					<File
 						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>
@@ -442,12 +412,6 @@ ECHO Done
 					<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>
@@ -1057,9 +1021,6 @@ ECHO Done
 				<File
 					RelativePath="..\..\src\LinearMath\btScalar.h">
 				</File>
-				<File
-					RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-				</File>
 				<File
 					RelativePath="..\..\src\LinearMath\btStackAlloc.h">
 				</File>
-- 
cgit v1.2.3