From 8c07b2a8a11451e34820aad60438fd137b4b9057 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 8 Aug 2009 00:41:57 +0000 Subject: [PATCH] fixes in build system --- src/BulletMultiThreaded/CMakeLists.txt | 16 ---------------- src/BulletMultiThreaded/PosixThreadSupport.h | 5 ++++- src/Makefile.am | 12 ------------ 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt index 07017c81f..253434bf9 100644 --- a/src/BulletMultiThreaded/CMakeLists.txt +++ b/src/BulletMultiThreaded/CMakeLists.txt @@ -37,19 +37,11 @@ ADD_LIBRARY(BulletMultiThreaded SpuNarrowPhaseCollisionTask/SpuContactResult.cpp SpuNarrowPhaseCollisionTask/SpuContactResult.h SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp - SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp - SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h - SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp - SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h - SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.cpp - SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h - SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.cpp - SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h @@ -58,14 +50,6 @@ ADD_LIBRARY(BulletMultiThreaded SpuSolverTask/SpuParallellSolverTask.cpp SpuSolverTask/SpuParallellSolverTask.h - SpuBatchRaycaster.cpp - SpuBatchRaycaster.h - SpuRaycastTaskProcess.cpp - SpuRaycastTaskProcess.h - SpuRaycastTask/SpuRaycastTask.cpp - SpuRaycastTask/SpuRaycastTask.h - SpuRaycastTask/SpuSubSimplexConvexCast.cpp - SpuRaycastTask/SpuSubSimplexConvexCast.h #Some GPU related stuff, mainly CUDA and perhaps OpenCL btGpu3DGridBroadphase.cpp diff --git a/src/BulletMultiThreaded/PosixThreadSupport.h b/src/BulletMultiThreaded/PosixThreadSupport.h index c7349baa9..7cc49115b 100644 --- a/src/BulletMultiThreaded/PosixThreadSupport.h +++ b/src/BulletMultiThreaded/PosixThreadSupport.h @@ -113,7 +113,10 @@ public: virtual void setNumTasks(int numTasks) {} - + virtual int getNumTasks() const + { + return m_activeSpuStatus.size(); + } }; #endif // POSIX_THREAD_SUPPORT_H diff --git a/src/Makefile.am b/src/Makefile.am index 716af8698..1a3465229 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,15 +20,11 @@ nobase_bullet_include_HEADERS += \ BulletMultiThreaded/SpuCollisionObjectWrapper.h \ BulletMultiThreaded/SpuSampleTaskProcess.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ @@ -55,12 +51,8 @@ libbulletmultithreaded_la_SOURCES =\ BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp \ BulletMultiThreaded/SpuLibspe2Support.cpp \ BulletMultiThreaded/SpuBatchRaycaster.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp \ BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp \ @@ -87,13 +79,9 @@ libbulletmultithreaded_la_SOURCES =\ BulletMultiThreaded/SpuParallelSolver.h \ BulletMultiThreaded/btThreadSupportInterface.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \