Don't use GLUT by default under Windows, but a Win32 App instead. All demos have to be fixed (only basic demo works now). Also on Mac OSX, we plan to use cocoa instead of Glut.

Demos/OpenGL/CMakeLists.txt

@@ -12,24 +12,41 @@
 
 
 
-
 INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull  
 )
 
+		
 ADD_LIBRARY(OpenGLSupport
 		GLDebugFont.cpp
+		GLDebugFont.h
 		GL_DialogDynamicsWorld.cpp
+		GL_DialogDynamicsWorld.h
 		GL_DialogWindow.cpp
+		GL_DialogWindow.h
 		GL_ShapeDrawer.cpp
+		GL_ShapeDrawer.h
 		GL_Simplex1to4.cpp
+		GL_Simplex1to4.h
 		GLDebugDrawer.cpp
-		GlutStuff.cpp
+		GLDebugDrawer.h
+		
 		RenderTexture.cpp
+		RenderTexture.h
 		DemoApplication.cpp
+		DemoApplication.h
+		
 		GlutDemoApplication.cpp
+		GlutDemoApplication.h
+		GlutStuff.cpp
+		GlutStuff.h
+
+
+		Win32DemoApplication.cpp
+		Win32DemoApplication.h
 )
 
+
 IF (BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
 ENDIF (BUILD_SHARED_LIBS)