Merged changes in the trunk up to revision 46557.
[blender.git] / extern / bullet2 / CMakeLists.txt
index 91d1cba425f70942df1c9aaa30d2193eae24f69a..51b295e897f9dba9cbae43b35c5614f8a1a4af2f 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -13,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
        .
        src
 )
 
-SET(SRC
+set(INC_SYS
+
+)
+
+set(SRC
        src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
        src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
        src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -107,7 +110,6 @@ SET(SRC
        src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
        src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
        src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
-       src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
        src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
        src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
        src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -119,6 +121,7 @@ SET(SRC
        src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
        src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
        src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+       src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
        src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
        src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
        src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -132,6 +135,7 @@ SET(SRC
        src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
        src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
        src/BulletDynamics/Vehicle/btWheelInfo.cpp
+       src/BulletSoftBody/btDefaultSoftBodySolver.cpp
        src/BulletSoftBody/btSoftBody.cpp
        src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
        src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -143,6 +147,210 @@ SET(SRC
        src/LinearMath/btConvexHull.cpp
        src/LinearMath/btGeometryUtil.cpp
        src/LinearMath/btQuickprof.cpp
+       src/LinearMath/btSerializer.cpp
+       # UNUSED
+       # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
+       # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
+       # src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
+       # src/BulletCollision/CollisionShapes/btBox2dShape.cpp
+       # src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
+       # src/BulletDynamics/Character/btKinematicCharacterController.cpp
+       # src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
+       # src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
+
+       src/Bullet-C-Api.h
+       src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
+       src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
+       src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
+       src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
+       src/BulletCollision/BroadphaseCollision/btDbvt.h
+       src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
+       src/BulletCollision/BroadphaseCollision/btDispatcher.h
+       src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
+       src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
+       src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
+       src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
+       src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
+       src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+       src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
+       src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
+       src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
+       src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
+       src/BulletCollision/CollisionDispatch/btCollisionObject.h
+       src/BulletCollision/CollisionDispatch/btCollisionWorld.h
+       src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
+       src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btGhostObject.h
+       src/BulletCollision/CollisionDispatch/btManifoldResult.h
+       src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
+       src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+       src/BulletCollision/CollisionDispatch/btUnionFind.h
+       src/BulletCollision/CollisionShapes/btBoxShape.h
+       src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
+       src/BulletCollision/CollisionShapes/btCapsuleShape.h
+       src/BulletCollision/CollisionShapes/btCollisionMargin.h
+       src/BulletCollision/CollisionShapes/btCollisionShape.h
+       src/BulletCollision/CollisionShapes/btCompoundShape.h
+       src/BulletCollision/CollisionShapes/btConcaveShape.h
+       src/BulletCollision/CollisionShapes/btConeShape.h
+       src/BulletCollision/CollisionShapes/btConvexHullShape.h
+       src/BulletCollision/CollisionShapes/btConvexInternalShape.h
+       src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
+       src/BulletCollision/CollisionShapes/btConvexShape.h
+       src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
+       src/BulletCollision/CollisionShapes/btCylinderShape.h
+       src/BulletCollision/CollisionShapes/btEmptyShape.h
+       src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
+       src/BulletCollision/CollisionShapes/btMaterial.h
+       src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
+       src/BulletCollision/CollisionShapes/btMultiSphereShape.h
+       src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
+       src/BulletCollision/CollisionShapes/btOptimizedBvh.h
+       src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+       src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
+       src/BulletCollision/CollisionShapes/btShapeHull.h
+       src/BulletCollision/CollisionShapes/btSphereShape.h
+       src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
+       src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
+       src/BulletCollision/CollisionShapes/btTetrahedronShape.h
+       src/BulletCollision/CollisionShapes/btTriangleBuffer.h
+       src/BulletCollision/CollisionShapes/btTriangleCallback.h
+       src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
+       src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
+       src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
+       src/BulletCollision/CollisionShapes/btTriangleMesh.h
+       src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
+       src/BulletCollision/CollisionShapes/btTriangleShape.h
+       src/BulletCollision/CollisionShapes/btUniformScalingShape.h
+       src/BulletCollision/Gimpact/btBoxCollision.h
+       src/BulletCollision/Gimpact/btClipPolygon.h
+       src/BulletCollision/Gimpact/btContactProcessing.h
+       src/BulletCollision/Gimpact/btGImpactBvh.h
+       src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
+       src/BulletCollision/Gimpact/btGImpactMassUtil.h
+       src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
+       src/BulletCollision/Gimpact/btGImpactShape.h
+       src/BulletCollision/Gimpact/btGenericPoolAllocator.h
+       src/BulletCollision/Gimpact/btGeometryOperations.h
+       src/BulletCollision/Gimpact/btQuantization.h
+       src/BulletCollision/Gimpact/btTriangleShapeEx.h
+       src/BulletCollision/Gimpact/gim_array.h
+       src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
+       src/BulletCollision/Gimpact/gim_bitset.h
+       src/BulletCollision/Gimpact/gim_box_collision.h
+       src/BulletCollision/Gimpact/gim_box_set.h
+       src/BulletCollision/Gimpact/gim_clip_polygon.h
+       src/BulletCollision/Gimpact/gim_contact.h
+       src/BulletCollision/Gimpact/gim_geom_types.h
+       src/BulletCollision/Gimpact/gim_geometry.h
+       src/BulletCollision/Gimpact/gim_hash_table.h
+       src/BulletCollision/Gimpact/gim_linear_math.h
+       src/BulletCollision/Gimpact/gim_math.h
+       src/BulletCollision/Gimpact/gim_memory.h
+       src/BulletCollision/Gimpact/gim_radixsort.h
+       src/BulletCollision/Gimpact/gim_tri_collision.h
+       src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
+       src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
+       src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+       src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+       src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
+       src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
+       src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
+       src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
+       src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
+       src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+       src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
+       src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
+       src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+       src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
+       src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
+       src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
+       src/BulletDynamics/Character/btCharacterControllerInterface.h
+       src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+       src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
+       src/BulletDynamics/ConstraintSolver/btContactConstraint.h
+       src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
+       src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
+       src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
+       src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
+       src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
+       src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
+       src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
+       src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
+       src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
+       src/BulletDynamics/ConstraintSolver/btSolverBody.h
+       src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
+       src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
+       src/BulletDynamics/Dynamics/btActionInterface.h
+       src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
+       src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
+       src/BulletDynamics/Dynamics/btDynamicsWorld.h
+       src/BulletDynamics/Dynamics/btRigidBody.h
+       src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
+       src/BulletDynamics/Vehicle/btRaycastVehicle.h
+       src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+       src/BulletDynamics/Vehicle/btWheelInfo.h
+       src/BulletSoftBody/btDefaultSoftBodySolver.h
+       src/BulletSoftBody/btSoftBody.h
+       src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
+       src/BulletSoftBody/btSoftBodyData.h
+       src/BulletSoftBody/btSoftBodyHelpers.h
+       src/BulletSoftBody/btSoftBodyInternals.h
+       src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
+       src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
+       src/BulletSoftBody/btSoftBodySolvers.h
+       src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
+       src/BulletSoftBody/btSoftRigidDynamicsWorld.h
+       src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
+       src/BulletSoftBody/btSparseSDF.h
+       src/LinearMath/btAabbUtil2.h
+       src/LinearMath/btAlignedAllocator.h
+       src/LinearMath/btAlignedObjectArray.h
+       src/LinearMath/btConvexHull.h
+       src/LinearMath/btDefaultMotionState.h
+       src/LinearMath/btGeometryUtil.h
+       src/LinearMath/btHashMap.h
+       src/LinearMath/btIDebugDraw.h
+       src/LinearMath/btList.h
+       src/LinearMath/btMatrix3x3.h
+       src/LinearMath/btMinMax.h
+       src/LinearMath/btMotionState.h
+       src/LinearMath/btPoint3.h
+       src/LinearMath/btPoolAllocator.h
+       src/LinearMath/btQuadWord.h
+       src/LinearMath/btQuaternion.h
+       src/LinearMath/btQuickprof.h
+       src/LinearMath/btRandom.h
+       src/LinearMath/btScalar.h
+       src/LinearMath/btSerializer.h
+       src/LinearMath/btSimdMinMax.h
+       src/LinearMath/btStackAlloc.h
+       src/LinearMath/btTransform.h
+       src/LinearMath/btTransformUtil.h
+       src/LinearMath/btVector3.h
+       src/btBulletCollisionCommon.h
+       src/btBulletDynamicsCommon.h
+       # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
+       # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
+       # src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
+       # src/BulletCollision/CollisionShapes/btBox2dShape.h
+       # src/BulletCollision/CollisionShapes/btConvex2dShape.h
+       # src/BulletDynamics/Character/btKinematicCharacterController.h
+       # src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
+       # src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
 )
 
-BLENDERLIB(extern_bullet "${SRC}" "${INC}")
+if(CMAKE_COMPILER_IS_GNUCXX)
+       # needed for gcc 4.6+
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+endif()
+
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")