diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt index ecf16a806..7fc028cc0 100644 --- a/Demos/AllBulletDemos/CMakeLists.txt +++ b/Demos/AllBulletDemos/CMakeLists.txt @@ -53,7 +53,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOUR ) LINK_LIBRARIES( -LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(AllBulletDemos @@ -70,7 +70,8 @@ ADD_EXECUTABLE(AllBulletDemos ../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp - ../RagdollDemo/RagdollDemo.cpp + ../SliderConstraintDemo/SliderConstraintDemo.cpp + ../RagdollDemo/RagdollDemo.cpp ../GimpactTestDemo/GimpactTestDemo.cpp ../Raytracer/Raytracer.cpp ../GjkConvexCastDemo/LinearConvexCastDemo.cpp diff --git a/Demos/AllBulletDemos/DemoEntries.cpp b/Demos/AllBulletDemos/DemoEntries.cpp index 15547c3ce..8df60b8bc 100644 --- a/Demos/AllBulletDemos/DemoEntries.cpp +++ b/Demos/AllBulletDemos/DemoEntries.cpp @@ -23,6 +23,7 @@ subject to the following restrictions: #include "../ConcaveConvexcastDemo/ConcaveConvexcastDemo.h" #include "../ConvexDecompositionDemo/ConvexDecompositionDemo.h" #include "../DynamicControlDemo/MotorDemo.h" +#include "../SliderConstraintDemo/SliderConstraintDemo.h" #include "../RagdollDemo/RagdollDemo.h" #include "../GimpactTestDemo/GimpactTestDemo.h" #include "../Raytracer/Raytracer.h" @@ -119,6 +120,7 @@ btDemoEntry g_demoEntries[] = {"SoftBody Bunny Match",SoftDemo16::Create}, {"DynamicControlDemo",MotorDemo::Create}, {"RagdollDemo",RagdollDemo::Create}, + {"SliderConstraint",SliderConstraintDemo::Create}, {"BasicDemo", BasicDemo::Create}, {"CcdPhysicsDemo", CcdPhysicsDemo::Create}, {"ConcaveDemo",ConcaveDemo::Create}, diff --git a/Demos/AllBulletDemos/Jamfile b/Demos/AllBulletDemos/Jamfile index 46ab6a77d..9b0b41764 100644 --- a/Demos/AllBulletDemos/Jamfile +++ b/Demos/AllBulletDemos/Jamfile @@ -14,6 +14,7 @@ FrameWorkDemo AllBulletDemos : ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp ../RagdollDemo/RagdollDemo.cpp + ../SliderConstraintDemo/SliderConstraintDemo.cpp ../GimpactTestDemo/GimpactTestDemo.cpp ../Raytracer/Raytracer.cpp ../GjkConvexCastDemo/LinearConvexCastDemo.cpp diff --git a/Demos/SoftDemo/CMakeLists.txt b/Demos/SoftDemo/CMakeLists.txt index e01d308b3..7538e7c57 100644 --- a/Demos/SoftDemo/CMakeLists.txt +++ b/Demos/SoftDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(SoftBodyDemo