Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

need to include <windows.h> before glut.h (issue with glui.h)

Browse Source
This commit is contained in:
erwin.coumans
2008-07-03 23:24:56 +00:00
parent a7f9bb8c8a
commit b6af86bd98
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Extras/glui/GL/glui.h
View File

@@ -39,7 +39,12 @@
#pragma warning(disable:4786) // Disable the "debug name too long" warning #pragma warning(disable:4786) // Disable the "debug name too long" warning
#endif #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 // FreeGLUT does not yet work perfectly with GLUI
// - use at your own risk. // - use at your own risk.
@@ -54,9 +59,11 @@
#else #else
#ifdef __APPLE__ #if defined(__APPLE__) && !defined (VMDMESA)
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <GLUT/glut.h> #include <GLUT/glut.h>
#else #else
// #include "../../freeglut/gl/glut.h" // #include "../../freeglut/gl/glut.h"
#include <GL/glut.h> #include <GL/glut.h>
#endif #endif