diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt
index efd2da3e1..c5bea09b4 100644
--- a/Demos/AllBulletDemos/CMakeLists.txt
+++ b/Demos/AllBulletDemos/CMakeLists.txt
@@ -13,11 +13,19 @@ LINK_DIRECTORIES(
 )
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include 
+${BULLET_PHYSICS_SOURCE_DIR}/src 
+${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
 )
 
 LINK_LIBRARIES(
-BulletColladaConverter GLUI  GIMPACTUtils ConvexDecomposition ColladaDom XML OpenGLSupport  BulletSoftBody BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+GLUI  GIMPACTUtils ConvexDecomposition OpenGLSupport  BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )
 
 
@@ -45,3 +53,19 @@ ADD_EXECUTABLE(AppAllBulletDemos
   ../ConstraintDemo/ConstraintDemo.cpp
 )
 
+
+IF (WIN32)
+	IF (CMAKE_CL_64)
+		ADD_CUSTOM_COMMAND(
+			TARGET AppAllBulletDemos
+			POST_BUILD
+			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+		)
+	ELSE(CMAKE_CL_64)
+		ADD_CUSTOM_COMMAND(
+			TARGET AppAllBulletDemos
+			POST_BUILD
+			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+		)
+	ENDIF(CMAKE_CL_64)
+ENDIF(WIN32)
\ No newline at end of file
diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index 79d117b8c..53f92b62f 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -1,39 +1,45 @@
+
+IF (USE_GLUT)
+
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+	SUBDIRS( OpenGL AllBulletDemos  ConvexDecompositionDemo Benchmarks HelloWorld
+		CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo Raytracer
+		RagdollDemo ForkLiftDemo BasicDemo Box2dDemo BspDemo MovingConcaveDemo VehicleDemo
+		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 BspDemo MovingConcaveDemo
+		VehicleDemo UserCollisionAlgorithm CharacterDemo SoftDemo
+	 	HeightFieldFluidDemo
+		CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo
+		DoublePrecisionDemo ConcaveDemo CollisionDemo
+		ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo
+		MultiMaterialDemo
+	)
+endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+
+ELSE (USE_GLUT)
+
 SUBDIRS( 
-OpenGL 
-BasicDemo 
-Benchmarks 
-Box2dDemo 
-CollisionInterfaceDemo 
-ConcaveDemo 
-ConstraintDemo 
-ConvexDecompositionDemo 
-InternalEdgeDemo
-GimpactTestDemo 
-GenericJointDemo 
-SerializeDemo 
-SoftDemo
+	OpenGL 
+	BasicDemo 
+	Benchmarks 
+	Box2dDemo 
+	CollisionInterfaceDemo 
+	ConcaveDemo 
+	ConstraintDemo 
+	ConvexDecompositionDemo 
+	InternalEdgeDemo
+	GimpactTestDemo 
+	GenericJointDemo 
+	SerializeDemo 
+	SoftDemo
 )
 
-
-#todo: re-enable the rest of the demos again
-
-#if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-#	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 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")
+ENDIF (USE_GLUT)
\ No newline at end of file
diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
index 68775710e..049f04dc9 100644
--- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
+++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
@@ -335,7 +335,7 @@ void ConcaveDemo::clientMoveAndDisplay()
 	if (m_animatedMesh)
 	{
 		static float offset=0.f;
-		offset+=0.01f;
+		offset+=dt;
 
 	//	setVertexPositions(waveheight,offset);
 		
diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index cf85cdf08..f89e45fa6 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -3,3 +3,7 @@ SUBDIRS( Serialize ConvexDecomposition GIMPACTUtils )
 IF (BUILD_BULLET_MAYA_DYNAMICA_PLUGIN)
 SUBDIRS(MayaPlugin)
 ENDIF(BUILD_BULLET_MAYA_DYNAMICA_PLUGIN)
+
+IF (USE_GLUT)
+SUBDIRS (glui)
+ENDIF (USE_GLUT)
\ No newline at end of file