From 92c69ddefa9070ba7910a0277edfd7680965e2e1 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 21 Oct 2008 19:06:29 +0000 Subject: [PATCH] added missing files to build systems for CMake and Automake (Makefile.am still needs to add additional include directory for BulletMultiThreaded, for vectormath) --- src/BulletCollision/CMakeLists.txt | 2 ++ src/Makefile.am | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index b893a8ffc..4837b7e88 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -43,6 +43,8 @@ ADD_LIBRARY(LibBulletCollision CollisionDispatch/btBoxBoxCollisionAlgorithm.h CollisionDispatch/btBoxBoxDetector.cpp CollisionDispatch/btBoxBoxDetector.h + CollisionDispatch/btGhostObject.cpp + CollisionDispatch/btGhostObject.h CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp CollisionDispatch/btSphereBoxCollisionAlgorithm.h CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp diff --git a/src/Makefile.am b/src/Makefile.am index ec0813858..0a5e7f851 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,6 +45,7 @@ libbulletcollision_a_SOURCES = \ BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp \ BulletCollision/CollisionDispatch/btCollisionObject.cpp \ BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp \ + BulletCollision/CollisionDispatch/btGhostObject.cpp \ BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp \ @@ -122,6 +123,7 @@ libbulletcollision_a_SOURCES = \ BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \ BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \ BulletCollision/CollisionDispatch/btCollisionObject.h \ + BulletCollision/CollisionDispatch/btGhostObject.h \ BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ @@ -316,5 +318,8 @@ libbulletmultithreaded_a_SOURCES =\ BulletMultiThreaded/SpuBatchRaycaster.h \ BulletMultiThreaded/PosixThreadSupport.h \ BulletMultiThreaded/SpuLibspe2Support.h \ - BulletMultiThreaded/SpuRaycastTaskProcess.h + BulletMultiThreaded/SpuRaycastTaskProcess.h \ + BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp \ + BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \ + BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h