Define USE_ADDR64 on x86-64 platform

Add configure option --disable-multithreaded which will disable building of libbulletmultithreaded.a and MultiThreadedDemo
2008-11-14 17:57:30 +00:00
parent 1f66cd15a7
commit 86727242a2
5 changed files with 96 additions and 70 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,77 @@
+if CONDITIONAL_BUILD_MULTITHREADED
+
 noinst_LIBRARIES	= libbulletmath.a libbulletcollision.a libbulletdynamics.a libbulletsoftbody.a libbulletmultithreaded.a

+libbulletmultithreaded_a_CXXFLAGS = ${CXXFLAGS} -I./BulletMultiThreaded/vectormath/scalar/cpp
+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 \
+		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp \
+		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \
+		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h
+
+else
+noinst_LIBRARIES	= libbulletmath.a libbulletcollision.a libbulletdynamics.a libbulletsoftbody.a
+endif
+
+
 libbulletmath_a_SOURCES	= \
 		LinearMath/btQuickprof.cpp \
 		LinearMath/btGeometryUtil.cpp \
@@ -261,68 +333,4 @@ libbulletsoftbody_a_SOURCES = \
 		BulletSoftBody/btSoftBodyHelpers.h


-libbulletmultithreaded_a_CXXFLAGS = ${CXXFLAGS} -I./BulletMultiThreaded/vectormath/scalar/cpp
-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 \
-		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp \
-		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \
-		BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h