From d4c15a8fc428b88b52eb1e5c180999725e1cfb2b Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 26 Jan 2013 21:19:42 +0100
Subject: fixups for mingw32 cross compilation


diff --git a/README.md b/README.md
index ddad806..d282d5a 100644
--- a/README.md
+++ b/README.md
@@ -202,6 +202,12 @@ complete, build OpenSCAD and package it to an installer:
 
     ./scripts/release-common.sh mingw32
 
+If you wish you can only build the openscad.exe binary:
+
+    cd mingw32
+    i686-pc-mingw32-qmake .. CONFIG+=mingw-cross-env
+    make
+    
 ### Compilation
 
 First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to
diff --git a/openscad.pro b/openscad.pro
index 4fdd11e..37e6fe3 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -233,6 +233,8 @@ HEADERS += src/version_check.h \
            \
            src/lodepng.h \
            src/OffscreenView.h \
+           src/OffscreenContext.h \
+           src/OffscreenContextAll.hpp \
            src/fbo.h \
            src/imageutils.h \
            src/system-gl.h \
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>
 
-- 
cgit v0.10.1