Merged changes in the trunk up to revision 46557.
[blender.git] / extern / bullet2 / CMakeLists.txt
index 74f0fc2ab56934701971f333aea0fec769d65ba2..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.
@@ -29,6 +28,10 @@ set(INC
        src
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
        src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.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,16 @@ 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
@@ -211,6 +225,7 @@ set(SRC
        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
@@ -247,7 +262,6 @@ set(SRC
        src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
        src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
        src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
-       src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
        src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
        src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
        src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
@@ -259,11 +273,13 @@ set(SRC
        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
@@ -282,11 +298,15 @@ set(SRC
        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
@@ -310,6 +330,7 @@ set(SRC
        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
@@ -317,6 +338,14 @@ set(SRC
        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
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -324,4 +353,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(extern_bullet "${SRC}" "${INC}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")