From efd3157d1f59b28229a270763b47cd340665cf52 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@replicant.com>
Date: Wed, 7 May 2014 10:19:27 -0700
Subject: [PATCH] only compile Bullet 3 if desired (with CMake) remove empty
 namespace

---
 src/BulletDynamics/Featherstone/btMultiBodyLink.h |  4 ++--
 src/CMakeLists.txt                                | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/BulletDynamics/Featherstone/btMultiBodyLink.h b/src/BulletDynamics/Featherstone/btMultiBodyLink.h
index af926f57f..df96b3c41 100644
--- a/src/BulletDynamics/Featherstone/btMultiBodyLink.h
+++ b/src/BulletDynamics/Featherstone/btMultiBodyLink.h
@@ -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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 820ac612f..f6755e520 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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