diff options
| author | zhang <zxpmyth@yahoo.com.cn> | 2007-06-28 08:12:52 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-06-28 08:12:52 -0600 |
| commit | e632964bd77ddcc0b0c5b1949bf0b4b14fe84299 (patch) | |
| tree | e2b5c35083a28ecbe73c834fd42bf21b27e33666 | |
| parent | 6f266c2afed6b3826dcbb15e5e1052e08eb02566 (diff) | |
| download | glu-e632964bd77ddcc0b0c5b1949bf0b4b14fe84299.tar.gz | |
a variety of fixes for MingW
| -rw-r--r-- | include/GL/glu.h | 13 | ||||
| -rw-r--r-- | src/libnurbs/nurbtess/monoTriangulation.h | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/GL/glu.h b/include/GL/glu.h index c0bac75..d82103d 100644 --- a/include/GL/glu.h +++ b/include/GL/glu.h @@ -44,6 +44,19 @@ #define GLAPIENTRYP GLAPIENTRY * #endif +#ifdef GLAPI +#undef GLAPI +#endif + +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32) +# define GLAPI __declspec(dllexport) +# 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 +# endif /* _STATIC_MESA support */ + + #ifndef GLAPI #define GLAPI #endif diff --git a/src/libnurbs/nurbtess/monoTriangulation.h b/src/libnurbs/nurbtess/monoTriangulation.h index 7ff7739..002549e 100644 --- a/src/libnurbs/nurbtess/monoTriangulation.h +++ b/src/libnurbs/nurbtess/monoTriangulation.h @@ -43,10 +43,9 @@ #include "definitions.h" #include "primitiveStream.h" #include "directedLine.h" +#include "arc.h" class Backend; -class Arc; -typedef Arc *Arc_ptr; class reflexChain{ Real2 *queue; |