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.

2010-01-19 22:59:49 +00:00
parent 5d3ba1daa6
commit 7b41af1765
13 changed files with 161 additions and 75 deletions
--- a/Demos/OpenGL/GL_DialogWindow.h
+++ b/Demos/OpenGL/GL_DialogWindow.h
@@ -32,11 +32,13 @@ class btCollisionObject;
 #endif
 #else

-#include <GL/glut.h>
+
 #ifdef _WINDOWS
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
+#else
+#include <GL/glut.h>
 #endif
 #endif