From b6af86bd982d78d3ac899a300b556135ed343439 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Thu, 3 Jul 2008 23:24:56 +0000
Subject: [PATCH] need to include <windows.h> before glut.h (issue with glui.h)

---
 Extras/glui/GL/glui.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Extras/glui/GL/glui.h b/Extras/glui/GL/glui.h
index 344132b60..e9b0ac0ff 100644
--- a/Extras/glui/GL/glui.h
+++ b/Extras/glui/GL/glui.h
@@ -39,7 +39,12 @@
 	#pragma warning(disable:4786) // Disable the "debug name too long" warning
 #endif
 
-#if defined(GLUI_FREEGLUT)
+
+#ifdef WIN32//for glut.h
+#include <windows.h>
+#endif
+
+#if defined(GLUI_FREEGLUT) || defined(BT_USE_FREEGLUT)
 
   // FreeGLUT does not yet work perfectly with GLUI
   //  - use at your own risk.
@@ -54,9 +59,11 @@
 
 #else 
 
-  #ifdef __APPLE__
+#if defined(__APPLE__) && !defined (VMDMESA)
+  #include <OpenGL/gl.h>
+  #include <OpenGL/glu.h>
   #include <GLUT/glut.h>
-  #else
+#else
 //	#include "../../freeglut/gl/glut.h"
   #include <GL/glut.h>
   #endif