only compile Bullet 3 if desired (with CMake)

remove empty namespace
This commit is contained in:
Erwin Coumans
2014-05-07 10:19:27 -07:00
parent a5d050bc5e
commit efd3157d1f
2 changed files with 8 additions and 6 deletions

View File

@@ -32,7 +32,7 @@ enum btMultiBodyLinkFlags
// Various spatial helper functions
//
namespace {
//namespace {
#ifdef TEST_SPATIAL_ALGEBRA_LAYER
@@ -343,7 +343,7 @@ namespace {
}
#endif
}
//}
//
// Link struct

View File

@@ -1,8 +1,10 @@
SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common BulletSoftBody BulletCollision BulletDynamics LinearMath )
IF(BUILD_MULTITHREADING)
SUBDIRS(MiniCL BulletMultiThreaded)
ENDIF()
IF(BUILD_BULLET3)
SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common )
ENDIF(BUILD_BULLET3)
SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
IF(INSTALL_LIBS)
#INSTALL of other files requires CMake 2.6