From a3c8bb172a94d555429e4fb369a50be1a94b5ce8 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 6 Apr 2008 07:15:31 +0000 Subject: [PATCH] removed BulltMultiThreaded demo from AllBulletDemos (there is still a standalone demo) --- Demos/AllBulletDemos/CMakeLists.txt | 3 +-- Demos/AllBulletDemos/DemoEntries.cpp | 4 ---- Demos/AllBulletDemos/DemoEntries.h | 2 +- Demos/AllBulletDemos/Jamfile | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt index d28ba4794..b3df8eea3 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 LibConvexHull LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(AllBulletDemos @@ -72,7 +72,6 @@ ADD_EXECUTABLE(AllBulletDemos ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp ../RagdollDemo/RagdollDemo.cpp ../GimpactTestDemo/GimpactTestDemo.cpp - ../MultiThreadedDemo/MultiThreadedDemo.cpp ../Raytracer/Raytracer.cpp ../GjkConvexCastDemo/LinearConvexCastDemo.cpp ../VehicleDemo/VehicleDemo.cpp diff --git a/Demos/AllBulletDemos/DemoEntries.cpp b/Demos/AllBulletDemos/DemoEntries.cpp index 014107bef..9ddc4deaf 100644 --- a/Demos/AllBulletDemos/DemoEntries.cpp +++ b/Demos/AllBulletDemos/DemoEntries.cpp @@ -25,7 +25,6 @@ subject to the following restrictions: #include "../DynamicControlDemo/MotorDemo.h" #include "../RagdollDemo/RagdollDemo.h" #include "../GimpactTestDemo/GimpactTestDemo.h" -#include "../MultiThreadedDemo/MultiThreadedDemo.h" #include "../Raytracer/Raytracer.h" #include "../GjkConvexCastDemo/LinearConvexCastDemo.h" #include "../VehicleDemo/VehicleDemo.h" @@ -111,9 +110,6 @@ btDemoEntry g_demoEntries[] = {"ConvexDecomposition",ConvexDecompositionDemo::Create}, {"BspDemo", BspDemo::Create}, {"Gimpact Test", GimpactConcaveDemo::Create}, -#ifndef BT_USE_DOUBLE_PRECISION - {"MultiThreaded", MultiThreadedDemo::Create}, -#endif //BT_USE_DOUBLE_PRECISION {"Raytracer Test",Raytracer::Create}, {"GjkConvexCast",LinearConvexCastDemo::Create}, {"VehicleDemo",VehicleDemo::Create}, diff --git a/Demos/AllBulletDemos/DemoEntries.h b/Demos/AllBulletDemos/DemoEntries.h index 030754624..631e59389 100644 --- a/Demos/AllBulletDemos/DemoEntries.h +++ b/Demos/AllBulletDemos/DemoEntries.h @@ -31,4 +31,4 @@ extern btDemoEntry g_demoEntries[]; -#endif //BT_DEMO_ENTRIES_H \ No newline at end of file +#endif //BT_DEMO_ENTRIES_H diff --git a/Demos/AllBulletDemos/Jamfile b/Demos/AllBulletDemos/Jamfile index 96f5581eb..31e0c08d8 100644 --- a/Demos/AllBulletDemos/Jamfile +++ b/Demos/AllBulletDemos/Jamfile @@ -15,7 +15,6 @@ FrameWorkDemo AllBulletDemos : ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp ../RagdollDemo/RagdollDemo.cpp ../GimpactTestDemo/GimpactTestDemo.cpp - ../MultiThreadedDemo/MultiThreadedDemo.cpp ../Raytracer/Raytracer.cpp ../GjkConvexCastDemo/LinearConvexCastDemo.cpp ../VehicleDemo/VehicleDemo.cpp