From e4ed38e7f6f62a2c2e138d592f82b77ed4345fa8 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 11 Oct 2008 05:52:45 +0000 Subject: [PATCH] more build system changes, to reflect Gimpact/BulletMultiThreaded move from Extras to src --- Demos/AllBulletDemos/Makefile.am | 3 +- Demos/MultiThreadedDemo/Makefile.am | 2 +- Extras/Makefile.am | 77 +---------------------------- src/CMakeLists.txt | 6 +-- src/Makefile.am | 76 ++++++++++++++++++++++++++-- 5 files changed, 78 insertions(+), 86 deletions(-) diff --git a/Demos/AllBulletDemos/Makefile.am b/Demos/AllBulletDemos/Makefile.am index 884b7fd83..1b61fc844 100644 --- a/Demos/AllBulletDemos/Makefile.am +++ b/Demos/AllBulletDemos/Makefile.am @@ -24,7 +24,6 @@ AllBulletDemo_SOURCES=\ Main.cpp AllBulletDemo_CXXFLAGS=\ -I@top_builddir@/src \ - -I@top_builddir@/Extras/GIMPACT/include \ -I@top_builddir@/Extras/GIMPACTUtils \ -I@top_builddir@/Extras/ConvexDecomposition \ -I@top_builddir@/Extras \ @@ -32,4 +31,4 @@ AllBulletDemo_CXXFLAGS=\ -I@top_builddir@/Demos/SoftDemo \ -I@top_builddir@/Demos/Benchmarks \ $(CXXFLAGS) -AllBulletDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -L../../Extras -lgimpact -lgimpactutils -lconvexdecomposition -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath -lglui @opengl_LIBS@ +AllBulletDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -L../../Extras -lgimpactutils -lconvexdecomposition -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath -lglui @opengl_LIBS@ diff --git a/Demos/MultiThreadedDemo/Makefile.am b/Demos/MultiThreadedDemo/Makefile.am index f1411d453..71d8dd3ca 100644 --- a/Demos/MultiThreadedDemo/Makefile.am +++ b/Demos/MultiThreadedDemo/Makefile.am @@ -1,5 +1,5 @@ noinst_PROGRAMS=MultiThreadedDemo MultiThreadedDemo_SOURCES=MultiThreadedDemo.cpp MultiThreadedDemo.h main.cpp -MultiThreadedDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL -I@top_builddir@/Extras -I@top_builddir@/Extras/BulletMultiThreaded $(CXXFLAGS) +MultiThreadedDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL -I@top_builddir@/Extras $(CXXFLAGS) MultiThreadedDemo_LDADD=-L../OpenGL -L../../Extras -L../../src -lbulletmultithreaded -lbulletopenglsupport -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@ -lpthread diff --git a/Extras/Makefile.am b/Extras/Makefile.am index aa8e2ce4e..e7d1c8f56 100644 --- a/Extras/Makefile.am +++ b/Extras/Makefile.am @@ -73,85 +73,10 @@ libconvexdecomposition_a_SOURCES =\ ConvexDecomposition/bestfitobb.h\ ConvexDecomposition/meshvolume.h -libgimpactutils_a_CXXFLAGS = ${CXXFLAGS} -IGIMPACT/include -I../src -IGIMPACTUtils -IConvexDecomposition +libgimpactutils_a_CXXFLAGS = ${CXXFLAGS} -I../src -IGIMPACTUtils -IConvexDecomposition libgimpactutils_a_SOURCES = GIMPACTUtils/btGImpactConvexDecompositionShape.cpp GIMPACTUtils/btGImpactConvexDecompositionShape.h -libgimpact_a_CXXFLAGS = ${CXXFLAGS} -IGIMPACT/include -I../src -libgimpact_a_SOURCES =\ - GIMPACT/src/Bullet/btGImpactBvh.cpp\ - GIMPACT/src/Bullet/btGImpactQuantizedBvh.cpp\ - GIMPACT/src/Bullet/btTriangleShapeEx.cpp\ - GIMPACT/src/Bullet/btGImpactCollisionAlgorithm.cpp\ - GIMPACT/src/Bullet/btGImpactShape.cpp\ - GIMPACT/src/core/gim_box_set.cpp\ - GIMPACT/src/core/gim_contact.cpp\ - GIMPACT/src/core/gim_memory.cpp\ - GIMPACT/src/core/gim_tri_collision.cpp - -libbulletmultithreaded_a_CXXFLAGS = $(CXXFLAGS) -I../src -IBulletMultiThreaded -libbulletmultithreaded_a_SOURCES =\ - BulletMultiThreaded/SpuCollisionObjectWrapper.cpp \ - 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 \ - BulletMultiThreaded/SpuRaycastTask/SpuSubSimplexConvexCast.cpp \ - BulletMultiThreaded/SpuParallelSolver.cpp \ - BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp \ - BulletMultiThreaded/btThreadSupportInterface.cpp \ - BulletMultiThreaded/SequentialThreadSupport.cpp \ - BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp \ - BulletMultiThreaded/Win32ThreadSupport.cpp \ - BulletMultiThreaded/SpuFakeDma.cpp \ - BulletMultiThreaded/SpuRaycastTaskProcess.cpp \ - BulletMultiThreaded/PosixThreadSupport.cpp \ - BulletMultiThreaded/SpuCollisionTaskProcess.cpp \ - BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp \ - BulletMultiThreaded/SpuSampleTaskProcess.cpp \ - BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h \ - BulletMultiThreaded/PpuAddressSpace.h \ - BulletMultiThreaded/SpuSampleTaskProcess.h \ - BulletMultiThreaded/SequentialThreadSupport.h \ - BulletMultiThreaded/PlatformDefinitions.h \ - BulletMultiThreaded/Win32ThreadSupport.h \ - BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h \ - 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 \ - BulletMultiThreaded/SpuRaycastTask/SpuSubSimplexConvexCast.h \ - BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h \ - BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h \ - BulletMultiThreaded/SpuGatheringCollisionDispatcher.h \ - BulletMultiThreaded/SpuFakeDma.h \ - BulletMultiThreaded/SpuSync.h \ - BulletMultiThreaded/SpuCollisionObjectWrapper.h \ - BulletMultiThreaded/SpuDoubleBuffer.h \ - BulletMultiThreaded/SpuCollisionTaskProcess.h \ - BulletMultiThreaded/SpuBatchRaycaster.h \ - BulletMultiThreaded/PosixThreadSupport.h \ - BulletMultiThreaded/SpuLibspe2Support.h \ - BulletMultiThreaded/SpuRaycastTaskProcess.h - - libxml_a_CFLAGS = -ILibXML/ -ILibXML/include/ -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE $(CXXFLAGS) libxml_a_SOURCES =\ LibXML/c14n.c\ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87a4c0391..e5c3c1904 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ if (CMAKE_SIZEOF_VOID_P MATCHES "8") -SUBDIRS( BulletSoftBody BulletCollision BulletDynamics Linea -rMath ) +SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) else (CMAKE_SIZEOF_VOID_P MATCHES "8") -SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics Linea -rMath ) +SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics LinearMath ) endif (CMAKE_SIZEOF_VOID_P MATCHES "8") diff --git a/src/Makefile.am b/src/Makefile.am index f85506cea..ec0813858 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libbulletmath.a libbulletcollision.a libbulletdynamics.a libbulletsoftbody.a +noinst_LIBRARIES = libbulletmath.a libbulletcollision.a libbulletdynamics.a libbulletsoftbody.a libbulletmultithreaded.a libbulletmath_a_SOURCES = \ LinearMath/btQuickprof.cpp \ @@ -188,8 +188,16 @@ libbulletcollision_a_SOURCES = \ BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \ BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \ BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \ - BulletCollision/BroadphaseCollision/btQuantizedBvh.h - + BulletCollision/BroadphaseCollision/btQuantizedBvh.h \ + BulletCollision/Gimpact/btGImpactBvh.cpp\ + BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp\ + BulletCollision/Gimpact/btTriangleShapeEx.cpp\ + BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp\ + BulletCollision/Gimpact/btGImpactShape.cpp\ + BulletCollision/Gimpact/gim_box_set.cpp\ + BulletCollision/Gimpact/gim_contact.cpp\ + BulletCollision/Gimpact/gim_memory.cpp\ + BulletCollision/Gimpact/gim_tri_collision.cpp libbulletdynamics_a_SOURCES = \ BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp \ @@ -248,3 +256,65 @@ libbulletsoftbody_a_SOURCES = \ BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h \ BulletSoftBody/btSoftRigidDynamicsWorld.h \ BulletSoftBody/btSoftBodyHelpers.h + +libbulletmultithreaded_a_SOURCES =\ + BulletMultiThreaded/SpuCollisionObjectWrapper.cpp \ + 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 \ + BulletMultiThreaded/SpuRaycastTask/SpuSubSimplexConvexCast.cpp \ + BulletMultiThreaded/SpuParallelSolver.cpp \ + BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp \ + BulletMultiThreaded/btThreadSupportInterface.cpp \ + BulletMultiThreaded/SequentialThreadSupport.cpp \ + BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp \ + BulletMultiThreaded/Win32ThreadSupport.cpp \ + BulletMultiThreaded/SpuFakeDma.cpp \ + BulletMultiThreaded/SpuRaycastTaskProcess.cpp \ + BulletMultiThreaded/PosixThreadSupport.cpp \ + BulletMultiThreaded/SpuCollisionTaskProcess.cpp \ + BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp \ + BulletMultiThreaded/SpuSampleTaskProcess.cpp \ + BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h \ + BulletMultiThreaded/PpuAddressSpace.h \ + BulletMultiThreaded/SpuSampleTaskProcess.h \ + BulletMultiThreaded/SequentialThreadSupport.h \ + BulletMultiThreaded/PlatformDefinitions.h \ + BulletMultiThreaded/Win32ThreadSupport.h \ + BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h \ + 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 \ + BulletMultiThreaded/SpuRaycastTask/SpuSubSimplexConvexCast.h \ + BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h \ + BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h \ + BulletMultiThreaded/SpuGatheringCollisionDispatcher.h \ + BulletMultiThreaded/SpuFakeDma.h \ + BulletMultiThreaded/SpuSync.h \ + BulletMultiThreaded/SpuCollisionObjectWrapper.h \ + BulletMultiThreaded/SpuDoubleBuffer.h \ + BulletMultiThreaded/SpuCollisionTaskProcess.h \ + BulletMultiThreaded/SpuBatchRaycaster.h \ + BulletMultiThreaded/PosixThreadSupport.h \ + BulletMultiThreaded/SpuLibspe2Support.h \ + BulletMultiThreaded/SpuRaycastTaskProcess.h +