From 4a75c572090edf6b0f7806f620eab91e6a496e71 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sat, 20 Dec 2014 21:46:30 +0100
Subject: [PATCH] Move -DNOGDI to main project file.

This is not related to the cross build but a workaround when including
windows.h that also defines Polygon. So it's now enabled for all Windows
builds including MSYS2.
---
 mingw-cross-env.pri | 2 +-
 openscad.pro        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index 97ee3814..5a6502a2 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -19,7 +19,7 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libexpat.a
   LIBS += mingw-cross-env/lib/libintl.a
   LIBS += mingw-cross-env/lib/libiconv.a
-  QMAKE_CXXFLAGS += -fpermissive -DNOGDI
+  QMAKE_CXXFLAGS += -fpermissive
   WINSTACKSIZE = 8388608 # 8MB # github issue 116
   QMAKE_CXXFLAGS += -Wl,--stack,$$WINSTACKSIZE
   LIBS += -Wl,--stack,$$WINSTACKSIZE 
diff --git a/openscad.pro b/openscad.pro
index d745c708..ff90be45 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -116,6 +116,7 @@ macx {
 
 win* {
   RC_FILE = openscad_win32.rc
+  QMAKE_CXXFLAGS += -DNOGDI
 }
 
 CONFIG += qt