| @@ -1,4 +1,4 @@ | |||
| /* $Id: gl.h,v 1.40 2000/05/22 16:22:47 brianp Exp $ */ | |||
| /* $Id: gl.h,v 1.41 2000/05/22 19:40:43 brianp Exp $ */ | |||
| /* | |||
| * Mesa 3-D graphics library | |||
| @@ -48,7 +48,7 @@ | |||
| #define __WIN32__ | |||
| #endif | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__)) | |||
| # if defined(_MSC_VER) && 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 */ | |||
| @@ -61,7 +61,7 @@ | |||
| /* non-Windows compilation */ | |||
| # define GLAPI extern | |||
| # define GLAPIENTRY | |||
| #endif /* WIN32 / CYGWIN32 bracket */ | |||
| #endif /* WIN32 / CYGWIN bracket */ | |||
| #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) | |||
| #include <gl/mesa_wgl.h> | |||
| @@ -15,7 +15,7 @@ extern "C" { | |||
| #endif | |||
| #if defined(_WIN32) && !defined(__CYGWIN32__) | |||
| #if defined(_WIN32) && !defined(__CYGWIN__) | |||
| #define WIN32_LEAN_AND_MEAN 1 | |||
| #include <windows.h> | |||
| #endif | |||
| @@ -1,4 +1,4 @@ | |||
| /* $Id: glu.h,v 1.20 2000/05/22 16:21:27 brianp Exp $ */ | |||
| /* $Id: glu.h,v 1.21 2000/05/22 19:40:43 brianp Exp $ */ | |||
| /* | |||
| * Mesa 3-D graphics library | |||
| @@ -39,7 +39,7 @@ extern "C" { | |||
| /* to facilitate clean DLL building ... */ | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__)) | |||
| # if defined(_MSC_VER) && defined(BUILD_GLU32) /* tag specify we're building mesa as a DLL */ | |||
| # define GLUAPI __declspec(dllexport) | |||
| # elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ | |||
| @@ -53,7 +53,7 @@ extern "C" { | |||
| # define GLUAPI extern | |||
| # define GLCALLBACK | |||
| # define GLCALLBACKP * | |||
| #endif /* WIN32 / CYGWIN32 bracket */ | |||
| #endif /* WIN32 / CYGWIN bracket */ | |||
| /* compatability guard so we don't need to change client code */ | |||
| #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) | |||
| @@ -1,4 +1,4 @@ | |||
| /* $Id: gluP.h,v 1.3 2000/05/22 16:25:37 brianp Exp $ */ | |||
| /* $Id: gluP.h,v 1.4 2000/05/22 19:41:11 brianp Exp $ */ | |||
| /* | |||
| * Mesa 3-D graphics library | |||
| @@ -23,6 +23,9 @@ | |||
| /* | |||
| * $Log: gluP.h,v $ | |||
| * Revision 1.4 2000/05/22 19:41:11 brianp | |||
| * replaced __CYGWIN32__ with __CYGWIN__ | |||
| * | |||
| * Revision 1.3 2000/05/22 16:25:37 brianp | |||
| * added some Window-isms formerly in gl.h | |||
| * | |||
| @@ -75,7 +78,7 @@ | |||
| # define __WIN32__ | |||
| #endif | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) | |||
| #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__)) | |||
| # pragma warning( disable : 4068 ) /* unknown pragma */ | |||
| # pragma warning( disable : 4710 ) /* function 'foo' not inlined */ | |||
| # pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */ | |||
| @@ -101,7 +104,7 @@ | |||
| # define GLAPIENTRYP __stdcall * | |||
| # define GLCALLBACK __stdcall | |||
| # define GLCALLBACKP __stdcall * | |||
| # if defined(__CYGWIN32__) | |||
| # if defined(__CYGWIN__) | |||
| # define GLCALLBACKPCAST * | |||
| # else | |||
| # define GLCALLBACKPCAST __stdcall * | |||
| @@ -118,7 +121,7 @@ | |||
| # define GLCALLBACKPCAST * | |||
| # define GLWINAPI | |||
| # define GLWINAPIV | |||
| #endif /* WIN32 / CYGWIN32 bracket */ | |||
| #endif /* WIN32 / CYGWIN bracket */ | |||
| /* compatability guard so we don't need to change client code */ | |||