diff options
| author | Zhang <zxpmyth@yahoo.com.cn> | 2007-07-21 11:28:06 -0600 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:03:35 +0100 |
| commit | efea7892f9d32fb46d6bde54ca1e8557fa31e680 (patch) | |
| tree | a6b36b76fb5860c1126afc4d9ea06d857d20b87e /include | |
| parent | 5e869b94cfb0012cb7cb60db00d4be6e28716450 (diff) | |
Fix a number of MINGW32 issues
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glut.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/GL/glut.h b/include/GL/glut.h index e0fad6e..e286349 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -10,6 +10,10 @@ #include <GL/gl.h> #include <GL/glu.h> +#if defined(__MINGW32__) +#include <GL/mesa_wgl.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -108,7 +112,7 @@ extern _CRTIMP void __cdecl exit(int); and redifinition of Windows system defs, also removes requirement of pretty much any standard windows header from this file */ -#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) +#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY @@ -130,8 +134,9 @@ extern _CRTIMP void __cdecl exit(int); # pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" ) # endif # define CALLBACK __stdcall -typedef int (GLUTAPIENTRY *PROC)(); + #if !defined(__MINGW32__) + typedef int (GLUTAPIENTRY *PROC)(); typedef void *HGLRC; typedef void *HDC; #endif |