From f59ad619a2fbf148ec7d7425f06555a66d902d97 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 6 Nov 2009 00:36:30 +0000 Subject: [PATCH] Disable BulletMultiThreaded, Gpu2dDemo, Gpu3dDemo, MiniCL_VectorAdd, they are currently not supported for 64bit platforms. --- Demos/CMakeLists.txt | 34 +++++++++++++++++----------------- src/CMakeLists.txt | 11 ++++------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt index f24f9ac4f..d91713305 100644 --- a/Demos/CMakeLists.txt +++ b/Demos/CMakeLists.txt @@ -1,20 +1,20 @@ if (CMAKE_SIZEOF_VOID_P MATCHES "8") -SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld -CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo Raytracer -RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo Gpu3dDemo MiniCL_VectorAdd BspDemo MovingConcaveDemo VehicleDemo -ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo HeightFieldFluidDemo -CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo -DoublePrecisionDemo ConcaveDemo CollisionDemo -ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo -MultiMaterialDemo) + SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld + CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo Raytracer + RagdollDemo ForkLiftDemo BasicDemo Box2dDemo BspDemo MovingConcaveDemo VehicleDemo + ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo HeightFieldFluidDemo + CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo + DoublePrecisionDemo ConcaveDemo CollisionDemo + ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo + MultiMaterialDemo) else (CMAKE_SIZEOF_VOID_P MATCHES "8") -SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld -MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo Raytracer -GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo Gpu3dDemo MiniCL_VectorAdd BspDemo MovingConcaveDemo -VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo - HeightFieldFluidDemo -CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo -DoublePrecisionDemo ConcaveDemo CollisionDemo -ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo -MultiMaterialDemo) + SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld + MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo Raytracer + GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo Gpu3dDemo MiniCL_VectorAdd BspDemo MovingConcaveDemo + VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo + HeightFieldFluidDemo + CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo + DoublePrecisionDemo ConcaveDemo CollisionDemo + ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo + MultiMaterialDemo) endif (CMAKE_SIZEOF_VOID_P MATCHES "8") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b2d47693..d901bb341 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,11 +1,8 @@ -#if your 64 bit platform breaks compilation for BulletMultiThreaded, -#please uncomment next lines, and file an issue in bullet.googlecode.com - -#if (CMAKE_SIZEOF_VOID_P MATCHES "8") -#SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) -#else (CMAKE_SIZEOF_VOID_P MATCHES "8") +if (CMAKE_SIZEOF_VOID_P MATCHES "8") +SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) +else (CMAKE_SIZEOF_VOID_P MATCHES "8") SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics LinearMath ) -#endif (CMAKE_SIZEOF_VOID_P MATCHES "8") +endif (CMAKE_SIZEOF_VOID_P MATCHES "8") #INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)