diff options
| author | Brian Paul <[email protected]> | 2004-11-08 15:08:48 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-11-08 15:08:48 +0000 |
| commit | 83889ffd970a807074d834849677fd233c031dc7 (patch) | |
| tree | f048187a4bcbc88b0e73dd028830f30642447602 /include | |
| parent | 5849e3d353d956643dd40a3d5f53c31e79ae8cf0 (diff) | |
Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW). (Gregor Anich)
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 4 | ||||
| -rw-r--r-- | include/GL/glut.h | 4 | ||||
| -rw-r--r-- | include/GL/mesa_wgl.h | 6 | ||||
| -rw-r--r-- | include/GL/wmesa.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 0bf4cd8097d..d9c6e30eb24 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -53,9 +53,9 @@ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern diff --git a/include/GL/glut.h b/include/GL/glut.h index 3a67f1f560d..7977dc94c92 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -75,7 +75,7 @@ extern "C" { To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */ /* XXX This is from Win32's <process.h> */ -# if !defined(_MSC_VER) && !defined(__cdecl) +# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl) /* Define __cdecl for non-Microsoft compilers. */ # define __cdecl # define GLUT_DEFINED___CDECL @@ -108,7 +108,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(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) +#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h index a331bb3514b..21473763ed5 100644 --- a/include/GL/mesa_wgl.h +++ b/include/GL/mesa_wgl.h @@ -32,7 +32,7 @@ #define _mesa_wgl_h_ -#include <gl/gl.h> +#include <GL/gl.h> #ifdef __cplusplus extern "C" { @@ -40,10 +40,10 @@ extern "C" { #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ diff --git a/include/GL/wmesa.h b/include/GL/wmesa.h index 79b3c823029..0a6e8b64246 100644 --- a/include/GL/wmesa.h +++ b/include/GL/wmesa.h @@ -50,7 +50,7 @@ extern "C" { #endif -#include "gl\gl.h" +#include "GL/gl.h" #if defined(_MSV_VER) && !defined(__GNUC__) # pragma warning (disable:4273) |