diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index f12a51981..4db5b98a9 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -1,2 +1,5 @@
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( OpenGL AllBulletDemos BulletDinoDemo ConvexDecompositionDemo Benchmarks HelloWorld CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )
+else (CMAKE_SIZEOF_VOID_P MATCHES "8")
 SUBDIRS( OpenGL AllBulletDemos BulletDinoDemo ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )
-
+endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index ae0d3cddc..b10813436 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -1 +1,5 @@
-SUBDIRS( glui ConvexDecomposition BulletMultiThreaded BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+	SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
+else (CMAKE_SIZEOF_VOID_P MATCHES "8")
+	SUBDIRS( glui ConvexDecomposition BulletMultiThreaded BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
+endif (CMAKE_SIZEOF_VOID_P MATCHES "8")