Updated INSTALL description. This info should go also in Bullet User Manual and Online.

Thanks to ejtttje http://code.google.com/p/bullet/issues/detail?id=248 Use GJK for GImpact triangle test See http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=3687 More improvements in GJK degeneracy handling (using second EPA/GJK run) Issue/discussion here http://code.google.com/p/bullet/issues/detail?id=250 CMake improvements Thanks to ejtttje http://code.google.com/p/bullet/issues/detail?id=247 Added basic camera/wall detection for character demo
2009-07-14 02:10:03 +00:00
parent c4ad354ac0
commit 60c107b7a7
20 changed files with 348 additions and 173 deletions
--- a/src/BulletCollision/CMakeLists.txt
+++ b/src/BulletCollision/CMakeLists.txt
@@ -4,31 +4,31 @@ SET(BulletCollision_SRCS
 	BroadphaseCollision/btAxisSweep3.cpp
 	BroadphaseCollision/btBroadphaseProxy.cpp
 	BroadphaseCollision/btCollisionAlgorithm.cpp
-	BroadphaseCollision/btDispatcher.cpp
-	BroadphaseCollision/btDbvtBroadphase.cpp
 	BroadphaseCollision/btDbvt.cpp
+	BroadphaseCollision/btDbvtBroadphase.cpp
+	BroadphaseCollision/btDispatcher.cpp
 	BroadphaseCollision/btMultiSapBroadphase.cpp
 	BroadphaseCollision/btOverlappingPairCache.cpp
 	BroadphaseCollision/btQuantizedBvh.cpp
 	BroadphaseCollision/btSimpleBroadphase.cpp
 	CollisionDispatch/btActivatingCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxDetector.cpp
 	CollisionDispatch/btCollisionDispatcher.cpp
 	CollisionDispatch/btCollisionObject.cpp
 	CollisionDispatch/btCollisionWorld.cpp
 	CollisionDispatch/btCompoundCollisionAlgorithm.cpp
 	CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
-	CollisionDispatch/btDefaultCollisionConfiguration.cpp
-	CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
-	CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
-	CollisionDispatch/btBoxBoxDetector.cpp
-	CollisionDispatch/btGhostObject.cpp
-	CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
-	CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
-	CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
 	CollisionDispatch/btConvexConvexAlgorithm.cpp
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+	CollisionDispatch/btDefaultCollisionConfiguration.cpp
 	CollisionDispatch/btEmptyCollisionAlgorithm.cpp
+	CollisionDispatch/btGhostObject.cpp
 	CollisionDispatch/btManifoldResult.cpp
 	CollisionDispatch/btSimulationIslandManager.cpp
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
 	CollisionDispatch/btUnionFind.cpp
 	CollisionDispatch/SphereTriangleDetector.cpp
 	CollisionShapes/btBoxShape.cpp
@@ -39,9 +39,9 @@ SET(BulletCollision_SRCS
 	CollisionShapes/btConcaveShape.cpp
 	CollisionShapes/btConeShape.cpp
 	CollisionShapes/btConvexHullShape.cpp
+	CollisionShapes/btConvexInternalShape.cpp
 	CollisionShapes/btConvexPointCloudShape.cpp
 	CollisionShapes/btConvexShape.cpp
-	CollisionShapes/btConvexInternalShape.cpp
 	CollisionShapes/btConvexTriangleMeshShape.cpp
 	CollisionShapes/btCylinderShape.cpp
 	CollisionShapes/btEmptyShape.cpp
@@ -52,34 +52,34 @@ SET(BulletCollision_SRCS
 	CollisionShapes/btOptimizedBvh.cpp
 	CollisionShapes/btPolyhedralConvexShape.cpp
 	CollisionShapes/btScaledBvhTriangleMeshShape.cpp
-	CollisionShapes/btTetrahedronShape.cpp
-	CollisionShapes/btSphereShape.cpp
 	CollisionShapes/btShapeHull.cpp
+	CollisionShapes/btSphereShape.cpp
 	CollisionShapes/btStaticPlaneShape.cpp
 	CollisionShapes/btStridingMeshInterface.cpp
-	CollisionShapes/btTriangleCallback.cpp
+	CollisionShapes/btTetrahedronShape.cpp
 	CollisionShapes/btTriangleBuffer.cpp
+	CollisionShapes/btTriangleCallback.cpp
 	CollisionShapes/btTriangleIndexVertexArray.cpp
 	CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
 	CollisionShapes/btTriangleMesh.cpp
 	CollisionShapes/btTriangleMeshShape.cpp
 	CollisionShapes/btUniformScalingShape.cpp
 	Gimpact/btContactProcessing.cpp
-	Gimpact/btGImpactShape.cpp
-	Gimpact/gim_contact.cpp
-	Gimpact/btGImpactBvh.cpp
 	Gimpact/btGenericPoolAllocator.cpp
-	Gimpact/gim_memory.cpp
+	Gimpact/btGImpactBvh.cpp
 	Gimpact/btGImpactCollisionAlgorithm.cpp
-	Gimpact/btTriangleShapeEx.cpp
-	Gimpact/gim_tri_collision.cpp
 	Gimpact/btGImpactQuantizedBvh.cpp
+	Gimpact/btGImpactShape.cpp
+	Gimpact/btTriangleShapeEx.cpp
 	Gimpact/gim_box_set.cpp
+	Gimpact/gim_contact.cpp
+	Gimpact/gim_memory.cpp
+	Gimpact/gim_tri_collision.cpp
 	NarrowPhaseCollision/btContinuousConvexCollision.cpp
-	NarrowPhaseCollision/btGjkEpa2.cpp
-	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
 	NarrowPhaseCollision/btConvexCast.cpp
 	NarrowPhaseCollision/btGjkConvexCast.cpp
+	NarrowPhaseCollision/btGjkEpa2.cpp
+	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
 	NarrowPhaseCollision/btGjkPairDetector.cpp
 	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
 	NarrowPhaseCollision/btPersistentManifold.cpp
@@ -96,9 +96,9 @@ SET(BroadphaseCollision_HDRS
 	BroadphaseCollision/btBroadphaseInterface.h
 	BroadphaseCollision/btBroadphaseProxy.h
 	BroadphaseCollision/btCollisionAlgorithm.h
-	BroadphaseCollision/btDispatcher.h
-	BroadphaseCollision/btDbvtBroadphase.h
 	BroadphaseCollision/btDbvt.h
+	BroadphaseCollision/btDbvtBroadphase.h
+	BroadphaseCollision/btDispatcher.h
 	BroadphaseCollision/btMultiSapBroadphase.h
 	BroadphaseCollision/btOverlappingPairCache.h
 	BroadphaseCollision/btOverlappingPairCallback.h
@@ -107,6 +107,8 @@ SET(BroadphaseCollision_HDRS
 )
 SET(CollisionDispatch_HDRS
 	CollisionDispatch/btActivatingCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxDetector.h
 	CollisionDispatch/btCollisionConfiguration.h
 	CollisionDispatch/btCollisionCreateFunc.h
 	CollisionDispatch/btCollisionDispatcher.h
@@ -114,18 +116,16 @@ SET(CollisionDispatch_HDRS
 	CollisionDispatch/btCollisionWorld.h
 	CollisionDispatch/btCompoundCollisionAlgorithm.h
 	CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
-	CollisionDispatch/btDefaultCollisionConfiguration.h
-	CollisionDispatch/btSphereSphereCollisionAlgorithm.h
-	CollisionDispatch/btBoxBoxCollisionAlgorithm.h
-	CollisionDispatch/btBoxBoxDetector.h
-	CollisionDispatch/btGhostObject.h
-	CollisionDispatch/btSphereBoxCollisionAlgorithm.h
-	CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
-	CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
 	CollisionDispatch/btConvexConvexAlgorithm.h
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+	CollisionDispatch/btDefaultCollisionConfiguration.h
 	CollisionDispatch/btEmptyCollisionAlgorithm.h
+	CollisionDispatch/btGhostObject.h
 	CollisionDispatch/btManifoldResult.h
 	CollisionDispatch/btSimulationIslandManager.h
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
 	CollisionDispatch/btUnionFind.h
 	CollisionDispatch/SphereTriangleDetector.h
 )
@@ -133,50 +133,68 @@ SET(CollisionShapes_HDRS
 	CollisionShapes/btBoxShape.h
 	CollisionShapes/btBvhTriangleMeshShape.h
 	CollisionShapes/btCapsuleShape.h
-	CollisionShapes/btCollisionMargin
+	CollisionShapes/btCollisionMargin.h
 	CollisionShapes/btCollisionShape.h
 	CollisionShapes/btCompoundShape.h
 	CollisionShapes/btConcaveShape.h
 	CollisionShapes/btConeShape.h
 	CollisionShapes/btConvexHullShape.h
+	CollisionShapes/btConvexInternalShape.h
 	CollisionShapes/btConvexPointCloudShape.h
 	CollisionShapes/btConvexShape.h
-	CollisionShapes/btConvexInternalShape.h
 	CollisionShapes/btConvexTriangleMeshShape.h
 	CollisionShapes/btCylinderShape.h
 	CollisionShapes/btEmptyShape.h
 	CollisionShapes/btHeightfieldTerrainShape.h
-	CollisionShapes/btMinkowskiSumShape.h
 	CollisionShapes/btMaterial.h
+	CollisionShapes/btMinkowskiSumShape.h
 	CollisionShapes/btMultimaterialTriangleMeshShape.h
 	CollisionShapes/btMultiSphereShape.h
 	CollisionShapes/btOptimizedBvh.h
 	CollisionShapes/btPolyhedralConvexShape.h
 	CollisionShapes/btScaledBvhTriangleMeshShape.h
-	CollisionShapes/btTetrahedronShape.h
-	CollisionShapes/btSphereShape.h
 	CollisionShapes/btShapeHull.h
+	CollisionShapes/btSphereShape.h
 	CollisionShapes/btStaticPlaneShape.h
 	CollisionShapes/btStridingMeshInterface.h
-	CollisionShapes/btTriangleCallback.h
+	CollisionShapes/btTetrahedronShape.h
 	CollisionShapes/btTriangleBuffer.h
+	CollisionShapes/btTriangleCallback.h
 	CollisionShapes/btTriangleIndexVertexArray.h
 	CollisionShapes/btTriangleIndexVertexMaterialArray.h
 	CollisionShapes/btTriangleMesh.h
 	CollisionShapes/btTriangleMeshShape.h
+	CollisionShapes/btTriangleShape.h
 	CollisionShapes/btUniformScalingShape.h
 )
 SET(Gimpact_HDRS
-	Gimpact/btGImpactShape.h
-	Gimpact/gim_contact.h
-	Gimpact/btGImpactBvh.h
+	Gimpact/btBoxCollision.h
+	Gimpact/btClipPolygon.h
+	Gimpact/btContactProcessing.h
 	Gimpact/btGenericPoolAllocator.h
-	Gimpact/gim_memory.h
+	Gimpact/btGeometryOperations.h
+	Gimpact/btGImpactBvh.h
 	Gimpact/btGImpactCollisionAlgorithm.h
-	Gimpact/btTriangleShapeEx.h
-	Gimpact/gim_tri_collision.h
+	Gimpact/btGImpactMassUtil.h
 	Gimpact/btGImpactQuantizedBvh.h
+	Gimpact/btGImpactShape.h
+	Gimpact/btQuantization.h
+	Gimpact/btTriangleShapeEx.h
+	Gimpact/gim_array.h
+	Gimpact/gim_basic_geometry_operations.h
+	Gimpact/gim_bitset.h
+	Gimpact/gim_box_collision.h
 	Gimpact/gim_box_set.h
+	Gimpact/gim_clip_polygon.h
+	Gimpact/gim_contact.h
+	Gimpact/gim_geom_types.h
+	Gimpact/gim_geometry.h
+	Gimpact/gim_hash_table.h
+	Gimpact/gim_linear_math.h
+	Gimpact/gim_math.h
+	Gimpact/gim_memory.h
+	Gimpact/gim_radixsort.h
+	Gimpact/gim_tri_collision.h
 )
 SET(NarrowPhaseCollision_HDRS
 	NarrowPhaseCollision/btContinuousConvexCollision.h
@@ -214,10 +232,17 @@ IF (BUILD_SHARED_LIBS)
  TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
 ENDIF (BUILD_SHARED_LIBS)

+
+
+
 #INSTALL of other files requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS BulletCollision DESTINATION .)
+	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	INSTALL(TARGETS BulletCollision DESTINATION lib)
        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
--- a/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
+++ b/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
@@ -298,7 +298,7 @@ public:


 //algorithm details
-//#define BULLET_TRIANGLE_COLLISION 1
+#define BULLET_TRIANGLE_COLLISION 1
 #define GIMPACT_VS_PLANE_COLLISION 1


--- a/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+++ b/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
@@ -47,6 +47,7 @@ bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& sim
 		//resultOut->addContactPoint(results.normal,results.witnesses[1],-results.depth);
 		wWitnessOnA = results.witnesses[0];
 		wWitnessOnB = results.witnesses[1];
+		v = results.normal;
 		return true;		
 		} else
 	{
@@ -54,6 +55,7 @@ bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& sim
 		{
 			wWitnessOnA = results.witnesses[0];
 			wWitnessOnB = results.witnesses[1];
+			v = results.normal;
 			return false;
 		}
 	}
--- a/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
+++ b/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -310,28 +310,18 @@ void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result&

 				if (isValid2)
 				{
-					btVector3 tmpNormalInB = tmpPointOnB-tmpPointOnA;
-					btScalar lenSqr = tmpNormalInB.length2();
-					if (lenSqr > (SIMD_EPSILON*SIMD_EPSILON))
+					btScalar distance2 = -(tmpPointOnA-tmpPointOnB).length();
+					//only replace valid penetrations when the result is deeper (check)
+					if (!isValid || (distance2 < distance))
 					{
-						tmpNormalInB /= btSqrt(lenSqr);
-						btScalar distance2 = -(tmpPointOnA-tmpPointOnB).length();
-						//only replace valid penetrations when the result is deeper (check)
-						if (!isValid || (distance2 < distance))
-						{
-							distance = distance2;
-							pointOnA = tmpPointOnA;
-							pointOnB = tmpPointOnB;
-							normalInB = tmpNormalInB;
-							isValid = true;
-							m_lastUsedMethod = 3;
-						} else
-						{
-							
-						}
-					} else
+						distance = distance2;
+						pointOnA = tmpPointOnA;
+						pointOnB = tmpPointOnB;
+						normalInB = m_cachedSeparatingAxis;
+						isValid = true;
+						m_lastUsedMethod = 3;
+					}  else
 					{
-						//isValid = false;
 						m_lastUsedMethod = 4;
 					}
 				} else
@@ -342,29 +332,23 @@ void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result&
 					///thanks to Jacob.Langford for the reproduction case
 					///http://code.google.com/p/bullet/issues/detail?id=250

-					btVector3 tmpNormalInB = tmpPointOnA - tmpPointOnB;
-					btScalar lenSqr = tmpNormalInB.length2();
-					if (lenSqr > (SIMD_EPSILON*SIMD_EPSILON))
+				
+					btScalar distance2 = (tmpPointOnA-tmpPointOnB).length()-margin;
+					//only replace valid distances when the distance is less
+					if (!isValid || (distance2 < distance))
 					{
-						tmpNormalInB /= btSqrt(lenSqr);
-						btScalar distance2 = (tmpPointOnA-tmpPointOnB).length()-margin;
-						//only replace valid distances when the distance is less
-						if (!isValid || (distance2 < distance))
-						{
-							distance = distance2;
-							pointOnA = tmpPointOnA;
-							pointOnB = tmpPointOnB;
-							pointOnA -= tmpNormalInB * marginA ;
-							pointOnB += tmpNormalInB * marginB ;
-							normalInB = tmpNormalInB;
-							isValid = true;
-							m_lastUsedMethod = 6;
-						} else
-						{
-							
-						}
+						distance = distance2;
+						pointOnA = tmpPointOnA;
+						pointOnB = tmpPointOnB;
+						pointOnA -= m_cachedSeparatingAxis * marginA ;
+						pointOnB += m_cachedSeparatingAxis * marginB ;
+						normalInB = m_cachedSeparatingAxis;
+						isValid = true;
+						m_lastUsedMethod = 6;
+					} else
+					{
+						m_lastUsedMethod = 5;
 					}
-					m_lastUsedMethod = 5;
 				}
 				
 			}
--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -3,25 +3,26 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )


 SET(BulletDynamics_SRCS
+	Character/btKinematicCharacterController.cpp
+	ConstraintSolver/btConeTwistConstraint.cpp
+	ConstraintSolver/btContactConstraint.cpp
+	ConstraintSolver/btGeneric6DofConstraint.cpp
 	ConstraintSolver/btGeneric6DofSpringConstraint.cpp
 	ConstraintSolver/btHinge2Constraint.cpp
-	ConstraintSolver/btUniversalConstraint.cpp
-	ConstraintSolver/btContactConstraint.cpp
-	ConstraintSolver/btConeTwistConstraint.cpp
-	ConstraintSolver/btGeneric6DofConstraint.cpp
 	ConstraintSolver/btHingeConstraint.cpp
 	ConstraintSolver/btPoint2PointConstraint.cpp
 	ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
 	ConstraintSolver/btSliderConstraint.cpp
 	ConstraintSolver/btSolve2LinearConstraint.cpp
 	ConstraintSolver/btTypedConstraint.cpp
-	Dynamics/Bullet-C-API.cpp
+	ConstraintSolver/btUniversalConstraint.cpp
+	Dynamics/btContinuousDynamicsWorld.cpp
 	Dynamics/btDiscreteDynamicsWorld.cpp
-	Dynamics/btSimpleDynamicsWorld.cpp
 	Dynamics/btRigidBody.cpp
+	Dynamics/btSimpleDynamicsWorld.cpp
+	Dynamics/Bullet-C-API.cpp
 	Vehicle/btRaycastVehicle.cpp
 	Vehicle/btWheelInfo.cpp
-	Character/btKinematicCharacterController.cpp
 )

 SET(Root_HDRS
@@ -29,14 +30,13 @@ SET(Root_HDRS
 	../btBulletCollisionCommon.h
 )
 SET(ConstraintSolver_HDRS
-	ConstraintSolver/btGeneric6DofSpringConstraint.h
-	ConstraintSolver/btHinge2Constraint.h
-	ConstraintSolver/btUniversalConstraint.h
+	ConstraintSolver/btConeTwistConstraint.h
 	ConstraintSolver/btConstraintSolver.h
 	ConstraintSolver/btContactConstraint.h
 	ConstraintSolver/btContactSolverInfo.h
-	ConstraintSolver/btConeTwistConstraint.h
 	ConstraintSolver/btGeneric6DofConstraint.h
+	ConstraintSolver/btGeneric6DofSpringConstraint.h
+	ConstraintSolver/btHinge2Constraint.h
 	ConstraintSolver/btHingeConstraint.h
 	ConstraintSolver/btJacobianEntry.h
 	ConstraintSolver/btPoint2PointConstraint.h
@@ -46,8 +46,10 @@ SET(ConstraintSolver_HDRS
 	ConstraintSolver/btSolverBody.h
 	ConstraintSolver/btSolverConstraint.h
 	ConstraintSolver/btTypedConstraint.h
+	ConstraintSolver/btUniversalConstraint.h
 )
 SET(Dynamics_HDRS
+	Dynamics/btActionInterface.h
 	Dynamics/btContinuousDynamicsWorld.h
 	Dynamics/btDiscreteDynamicsWorld.h
 	Dynamics/btDynamicsWorld.h
@@ -84,8 +86,12 @@ IF (BUILD_SHARED_LIBS)
 ENDIF (BUILD_SHARED_LIBS)

 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS BulletDynamics DESTINATION .)
+	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	INSTALL(TARGETS BulletDynamics DESTINATION lib)
 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
--- a/src/BulletSoftBody/CMakeLists.txt
+++ b/src/BulletSoftBody/CMakeLists.txt
@@ -5,22 +5,23 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src }

 SET(BulletSoftBody_SRCS
 	btSoftBody.cpp
+	btSoftBodyConcaveCollisionAlgorithm.cpp
 	btSoftBodyHelpers.cpp
 	btSoftBodyRigidBodyCollisionConfiguration.cpp
 	btSoftRigidCollisionAlgorithm.cpp
-	btSoftSoftCollisionAlgorithm.cpp
-	btSoftBodyConcaveCollisionAlgorithm.cpp
 	btSoftRigidDynamicsWorld.cpp
+	btSoftSoftCollisionAlgorithm.cpp
 )

 SET(BulletSoftBody_HDRS
 	btSoftBody.h
-	btSparseSDF.h
-	btSoftBodyHelpers.h
-	btSoftRigidCollisionAlgorithm.h
-	btSoftSoftCollisionAlgorithm.h
 	btSoftBodyConcaveCollisionAlgorithm.h
+	btSoftBodyHelpers.h
+	btSoftBodyRigidBodyCollisionConfiguration.h
+	btSoftRigidCollisionAlgorithm.h
 	btSoftRigidDynamicsWorld.h
+	btSoftSoftCollisionAlgorithm.h
+	btSparseSDF.h
 )


@@ -33,8 +34,12 @@ IF (BUILD_SHARED_LIBS)
 ENDIF (BUILD_SHARED_LIBS)

 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,10 @@ endif (CMAKE_SIZEOF_VOID_P MATCHES "8")

 #INSTALL of other files requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		# Don't actually need to install any common files, the frameworks include everything
+	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
        INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h Bullet-C-Api.h DESTINATION include)
+	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

--- a/src/LinearMath/CMakeLists.txt
+++ b/src/LinearMath/CMakeLists.txt
@@ -1,38 +1,38 @@

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
+	${BULLET_PHYSICS_SOURCE_DIR}/src }
 )

 SET(LinearMath_SRCS
+	btAlignedAllocator.cpp
 		btConvexHull.cpp
-		btQuickprof.cpp
 		btGeometryUtil.cpp
-		btAlignedAllocator.cpp
+	btQuickprof.cpp
 )

 SET(LinearMath_HDRS
+	btAabbUtil2.h
+	btAlignedAllocator.h
 		btAlignedObjectArray.h
-		btList.h
-		btPoolAllocator.h
-		btRandom.h
-		btVector3.h
+	btConvexHull.h
 		btDefaultMotionState.h
-		btMatrix3x3.h
-		btQuadWord.h
+	btGeometryUtil.h
 		btHashMap.h
-		btScalar.h
-		btAabbUtil2.h
-		btConvexHull.h
+	btIDebugDraw.h
+	btList.h
+	btMatrix3x3.h
 		btMinMax.h
+	btMotionState.h
+	btPoolAllocator.h
+	btQuadWord.h
 		btQuaternion.h
+	btQuickprof.h
+	btRandom.h
+	btScalar.h
 		btStackAlloc.h
-		btGeometryUtil.h
-		btMotionState.h
 		btTransform.h
-		btAlignedAllocator.h
-		btIDebugDraw.h
-		btQuickprof.h
 		btTransformUtil.h
+	btVector3.h
 )

 ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
@@ -41,8 +41,12 @@ SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION})

 #FILES_MATCHING requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS LinearMath DESTINATION .)
+	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	INSTALL(TARGETS LinearMath DESTINATION lib)
 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)