diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-26 20:19:42 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-26 20:19:42 (GMT) |
| commit | d4c15a8fc428b88b52eb1e5c180999725e1cfb2b (patch) | |
| tree | 4248529f5c72b2fecc804bb3147eba3ec477926d /src | |
| parent | 743a82148dd2ddfdbd0eba24b208f1249ab4065d (diff) | |
fixups for mingw32 cross compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/OffscreenContextWGL.cc | 1 | ||||
| -rw-r--r-- | src/system-gl.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/OffscreenContextWGL.cc b/src/OffscreenContextWGL.cc index 71d07e3..b8e1481 100644 --- a/src/OffscreenContextWGL.cc +++ b/src/OffscreenContextWGL.cc @@ -82,6 +82,7 @@ string get_os_info() string offscreen_context_getinfo(OffscreenContext *ctx) { + // should probably get some info from WGL context here? stringstream out; out << "GL context creator: WGL\n" << "PNG generator: lodepng\n" diff --git a/src/system-gl.h b/src/system-gl.h index 4a8ccac..dd465f6 100644 --- a/src/system-gl.h +++ b/src/system-gl.h @@ -1,6 +1,12 @@ #ifndef SYSTEMGL_H_ #define SYSTEMGL_H_ +#ifdef _WIN32 +// Prevent obtuse compile errors on Win32/mingw32. This is related +// GLU Tessellation callback definitions, and how glew deals with them. +#include <windows.h> +#endif + #include <GL/glew.h> #include <string> |