fixed build/project files

2008-04-10 21:28:37 +00:00
parent 1139c06a4d
commit fd5057ec5a
27 changed files with 604 additions and 573 deletions
--- a/Demos/AllBulletDemos/CMakeLists.txt
+++ b/Demos/AllBulletDemos/CMakeLists.txt
@@ -49,11 +49,11 @@ ELSE (WIN32)
 ENDIF (WIN32)

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibBulletColladaConverter LibGLUI  LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibConvexHull  LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibBulletColladaConverter LibGLUI  LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport  LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(AllBulletDemos
--- a/Demos/AllBulletDemos/Jamfile
+++ b/Demos/AllBulletDemos/Jamfile
@@ -19,8 +19,5 @@ FrameWorkDemo AllBulletDemos :
 	../GjkConvexCastDemo/LinearConvexCastDemo.cpp
 	../VehicleDemo/VehicleDemo.cpp
 	../SoftDemo/SoftDemo.cpp
-	../SoftDemo/btSoftBodyRigidBodyCollisionConfiguration.cpp
-	../SoftDemo/btSoftSoftCollisionAlgorithm.cpp
-	../SoftDemo/btSoftRigidCollisionAlgorithm.cpp
 	../ConstraintDemo/ConstraintDemo.cpp
 ;
--- a/Demos/BasicDemo/CMakeLists.txt
+++ b/Demos/BasicDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(BasicDemo
--- a/Demos/Benchmarks/CMakeLists.txt
+++ b/Demos/Benchmarks/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport   LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(Benchmarks
--- a/Demos/BspDemo/CMakeLists.txt
+++ b/Demos/BspDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
 )

 LINK_LIBRARIES(
- LibOpenGLSupport LibConvexHull LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+ LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(BspPhysicsDemo
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -1,2 +1,2 @@
-SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )
+SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )

--- a/Demos/CcdPhysicsDemo/CMakeLists.txt
+++ b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(CcdPhysicsDemo
--- a/Demos/CharacterDemo/CMakeLists.txt
+++ b/Demos/CharacterDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
- LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+ LibOpenGLSupport  LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(CharacterDemo
--- a/Demos/ColladaDemo/CMakeLists.txt
+++ b/Demos/ColladaDemo/CMakeLists.txt
@@ -48,11 +48,11 @@ ELSE (WIN32)
 ENDIF (WIN32)

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter $(BULLET_PHYSICS_SOURCE_DIR)/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport  LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(ColladaDemo
--- a/Demos/ConstraintDemo/CMakeLists.txt
+++ b/Demos/ConstraintDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(ConstraintDemo
--- a/Demos/GenericJointDemo/CMakeLists.txt
+++ b/Demos/GenericJointDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(GenericJointDemo
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes"
  rule BulletDemo
  {
    Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  bulletopenglsupport convexhull bulletdynamics bulletcollision bulletmath ;
+    LinkWith $(<) :  bulletopenglsupport  bulletdynamics bulletcollision bulletmath ;
    CFlags $(<) : 
 	  [ FIncludes $(TOP)/Demos/OpenGL ] 
 	  [ FIncludes $(TOP)/Extras/ConvexHull ]
@@ -37,7 +37,7 @@ if $(GLUT.AVAILABLE) = "yes"
  rule FrameWorkDemo
  {
    Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  GIMPACTUtils  GIMPACT  bulletopenglsupport bulletmultithreaded convexdecomposition convexhull  bulletdynamics bulletcollision bulletmath glui ;
+    LinkWith $(<) :  GIMPACTUtils  GIMPACT  bulletopenglsupport  convexdecomposition   bulletdynamics bulletcollision bulletmath glui ;
    CFlags $(<) :
          [ FIncludes $(TOP)/Extras ]
         [ FIncludes $(TOP)/Demos/OpenGL ]
@@ -80,6 +80,7 @@ SubInclude TOP Demos GimpactTestDemo ;
 SubInclude TOP Demos MovingConcaveDemo ;
 SubInclude TOP Demos ConcaveDemo ;
 SubInclude TOP Demos ConstraintDemo ;
+SubInclude TOP Demos SliderConstraintDemo ;
 SubInclude TOP Demos RagdollDemo ;
 SubInclude TOP Demos GenericJointDemo ;
 SubInclude TOP Demos SoftDemo ;
--- a/Demos/MovingConcaveDemo/CMakeLists.txt
+++ b/Demos/MovingConcaveDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}
 )

 LINK_LIBRARIES(
-LibGIMPACT LibOpenGLSupport LibConvexHull LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibGIMPACT LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(MovingConcaveDemo
--- a/Demos/MultiThreadedDemo/CMakeLists.txt
+++ b/Demos/MultiThreadedDemo/CMakeLists.txt
@@ -53,7 +53,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletMultiThreaded LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport   LibBulletMultiThreaded LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(MultiThreadedDemo
--- a/Demos/MultiThreadedDemo/Jamfile
+++ b/Demos/MultiThreadedDemo/Jamfile
@@ -1,3 +1,27 @@
 SubDir TOP Demos MultiThreadedDemo ;

-FrameWorkDemo MultiThreadedDemo : [ Wildcard *.h *.cpp  ] ;
+#some demos need extra functionality, Collada / ConvexDecomposition etc.
+
+  rule ExtraDemo4
+
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :  bulletopenglsupport bulletmultithreaded bulletdynamics bulletcollision  bulletmath ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Demos/OpenGL ]
+				[ FIncludes $(TOP)/Extras/BulletMultiThreaded ]
+                        
+    ;
+
+    MsvcIncDirs $(<) :
+        "../../Demos/OpenGL"
+	"../../Extras/BulletColladaConverter"
+        "../../Extras/COLLADA_DOM/include"
+        "../../Extras/COLLADA_DOM/include/1.4"
+        "../../Extras/LibXML"
+        "../../Extras/LibXML/include"   ;
+  }
+
+ExtraDemo4 MultiThreadedDemo : [ Wildcard *.h *.cpp  ] ;
+
+MsvcIncDirs MultiThreadedDemo : "../../Extras/BulletMultiThreaded" ;
--- a/Demos/OpenGL/GL_ShapeDrawer.cpp
+++ b/Demos/OpenGL/GL_ShapeDrawer.cpp
@@ -41,7 +41,7 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btUniformScalingShape.h"
 #include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 ///
-#include "btShapeHull.h"
+#include "BulletCollision/CollisionShapes/btShapeHull.h"

 #include "LinearMath/btTransformUtil.h"

--- a/Demos/OpenGL/Jamfile
+++ b/Demos/OpenGL/Jamfile
@@ -9,18 +9,11 @@ if $(GLUT.AVAILABLE) = "yes"
  [ Wildcard *.h *.cpp ] : noinstall 
 ;

-CFlags bulletopenglsupport : [ FIncludes $(TOP)/Extras/ConvexHull ]
-;

-  MsvcIncDirs bulletopenglsupport :
-        "../../Extras/ConvexHull" ;
        
-bulletopenglsupport.CFLAGS = [ FIncludes $(TOP)/Extras/ConvexHull ] ;
-#same for msvcgen
-MsvcGenConfig bulletopenglsupport.INCDIRS : $(TOP)/Extras/ConvexHull ;


-LibDepends bulletopenglsupport : bulletdynamics convexhull  ;
+LibDepends bulletopenglsupport : bulletdynamics   ;

  ExternalLibs bulletopenglsupport : GLUT ;
 }
--- a/Demos/RagdollDemo/CMakeLists.txt
+++ b/Demos/RagdollDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(RagdollDemo
--- a/Demos/SoftDemo/CMakeLists.txt
+++ b/Demos/SoftDemo/CMakeLists.txt
@@ -52,14 +52,11 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
-LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(SoftBodyDemo
 	main.cpp
-	btSoftBodyRigidBodyCollisionConfiguration.cpp
-	btSoftRigidCollisionAlgorithm.cpp
-	btSoftSoftCollisionAlgorithm.cpp
 	SoftDemo.cpp
 )

--- a/Demos/UserCollisionAlgorithm/CMakeLists.txt
+++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
 )

 LINK_LIBRARIES(
- LibOpenGLSupport LibConvexHull  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+ LibOpenGLSupport   LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(UserCollisionAlgorithm
--- a/Demos/VehicleDemo/CMakeLists.txt
+++ b/Demos/VehicleDemo/CMakeLists.txt
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )

 LINK_LIBRARIES(
- LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+ LibOpenGLSupport  LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

 ADD_EXECUTABLE(VehicleDemo
--- a/src/BulletCollision/CMakeLists.txt
+++ b/src/BulletCollision/CMakeLists.txt
@@ -95,6 +95,8 @@ ADD_LIBRARY(LibBulletCollision
 				CollisionShapes/btTetrahedronShape.h
 				CollisionShapes/btSphereShape.cpp
 				CollisionShapes/btSphereShape.h
+				CollisionShapes/btShapeHull.h
+				CollisionShapes/btShapeHull.cpp
 				CollisionShapes/btStaticPlaneShape.cpp
 				CollisionShapes/btStaticPlaneShape.h
 				CollisionShapes/btStridingMeshInterface.cpp
--- a/src/BulletCollision/CollisionShapes/btShapeHull.cpp
+++ b/src/BulletCollision/CollisionShapes/btShapeHull.cpp
@@ -16,7 +16,7 @@ subject to the following restrictions:
 */

 #include "btShapeHull.h"
-#include "btConvexHull.h"
+#include "LinearMath/btConvexHull.h"

 #define NUM_UNITSPHERE_POINTS 42

--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -16,6 +16,8 @@ ADD_LIBRARY(LibBulletDynamics
 	ConstraintSolver/btPoint2PointConstraint.h
 	ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
 	ConstraintSolver/btSequentialImpulseConstraintSolver.h
+	ConstraintSolver/btSliderConstraint.cpp
+	ConstraintSolver/btSliderConstraint.h
 	ConstraintSolver/btSolve2LinearConstraint.cpp
 	ConstraintSolver/btSolve2LinearConstraint.h
 	ConstraintSolver/btTypedConstraint.cpp
@@ -48,4 +50,14 @@ ADD_LIBRARY(LibBulletDynamics
 	SoftBody/btSoftBody.h
 	SoftBody/btSoftBodyHelpers.cpp
 	SoftBody/btSparseSDF.h
+	SoftBody/btDbvt.cpp  
+	SoftBody/btDbvt.h
+	SoftBody/btSoftBodyHelpers.h
+	SoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
+	SoftBody/btSoftRigidCollisionAlgorithm.cpp
+	SoftBody/btSoftRigidCollisionAlgorithm.h
+	SoftBody/btSoftSoftCollisionAlgorithm.cpp
+	SoftBody/btSoftSoftCollisionAlgorithm.h
+	SoftBody/btSoftRigidDynamicsWorld.h
+	SoftBody/btSoftRigidDynamicsWorld.cpp
 )
--- a/src/BulletDynamics/SoftBody/btDbvt.cpp
+++ b/src/BulletDynamics/SoftBody/btDbvt.cpp
--- a/src/BulletDynamics/SoftBody/btDbvt.h
+++ b/src/BulletDynamics/SoftBody/btDbvt.h
@@ -68,6 +68,13 @@ struct	btDbvt
 		};
 	// Interfaces
 	
+	struct	sStkElm
+		{
+		const Node*	a;
+		const Node*	b;
+		sStkElm(const Node* na,const Node* nb) : a(na),b(nb) {}
+		};
+		
 	/* ICollide	*/ 
 	struct	ICollide
 		{
--- a/src/LinearMath/CMakeLists.txt
+++ b/src/LinearMath/CMakeLists.txt
@@ -15,6 +15,8 @@ ADD_LIBRARY(LibLinearMath
 		btHashMap.h
 		btScalar.h
 		btAabbUtil2.h
+		btConvexHull.h
+		btConvexHull.cpp
 		btMinMax.h
 		btQuaternion.h
 		btStackAlloc.h