Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes in build system

Browse Source
This commit is contained in:
erwin.coumans
2009-08-08 00:41:57 +00:00
parent aef97d6015
commit 8c07b2a8a1
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -37,19 +37,11 @@ ADD_LIBRARY(BulletMultiThreaded
SpuNarrowPhaseCollisionTask/SpuContactResult.cpp SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
SpuNarrowPhaseCollisionTask/SpuContactResult.h SpuNarrowPhaseCollisionTask/SpuContactResult.h
SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp
SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h
SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h
SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.cpp
SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h
SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.cpp
SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h
SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h
@@ -58,14 +50,6 @@ ADD_LIBRARY(BulletMultiThreaded
SpuSolverTask/SpuParallellSolverTask.cpp SpuSolverTask/SpuParallellSolverTask.cpp
SpuSolverTask/SpuParallellSolverTask.h 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 #Some GPU related stuff, mainly CUDA and perhaps OpenCL
btGpu3DGridBroadphase.cpp btGpu3DGridBroadphase.cpp

5
src/BulletMultiThreaded/PosixThreadSupport.h
View File

@@ -113,7 +113,10 @@ public:
virtual void setNumTasks(int numTasks) {} virtual void setNumTasks(int numTasks) {}
virtual int getNumTasks() const
{
return m_activeSpuStatus.size();
}
}; };
#endif // POSIX_THREAD_SUPPORT_H #endif // POSIX_THREAD_SUPPORT_H

12
src/Makefile.am
View File

@@ -20,15 +20,11 @@ nobase_bullet_include_HEADERS += \
BulletMultiThreaded/SpuCollisionObjectWrapper.h \ BulletMultiThreaded/SpuCollisionObjectWrapper.h \
BulletMultiThreaded/SpuSampleTaskProcess.h \ BulletMultiThreaded/SpuSampleTaskProcess.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \
@@ -55,12 +51,8 @@ libbulletmultithreaded_la_SOURCES =\
BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp \ BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp \
BulletMultiThreaded/SpuLibspe2Support.cpp \ BulletMultiThreaded/SpuLibspe2Support.cpp \
BulletMultiThreaded/SpuBatchRaycaster.cpp \ BulletMultiThreaded/SpuBatchRaycaster.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp \
BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp \ BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp \
@@ -87,13 +79,9 @@ libbulletmultithreaded_la_SOURCES =\
BulletMultiThreaded/SpuParallelSolver.h \ BulletMultiThreaded/SpuParallelSolver.h \
BulletMultiThreaded/btThreadSupportInterface.h \ BulletMultiThreaded/btThreadSupportInterface.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \
BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \ BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \