Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only compile Bullet 3 if desired (with CMake)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletDynamics/Featherstone/btMultiBodyLink.h
View File

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

10
src/CMakeLists.txt
View File

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