Merge branch 'qmakemod' of github.com:donbright/openscad into qmakemod

2 files changed, 9 insertions, 4 deletions

diff --git a/openscad.pro b/openscad.pro
index 160eaa1..e38251a 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -77,8 +77,13 @@ win32 {
 CONFIG += qt
 QT += opengl
 
+# Fedora Linux + DSO fix
 linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) {
-  LIBS += -lGLU # Fedora + DSO 
+  LIBS += -lGLU
+}
+
+CONFIG(mingw-cross-env) {
+  include(mingw-cross-env.pri)
 }
 
 # Application configuration
diff --git a/win32.pri b/win32.pri
index 7a020d7..bb41b09 100644
--- a/win32.pri
+++ b/win32.pri
@@ -1,6 +1,6 @@
-# win32-specific general settings
+# win32-specific MSVC compiler general settings
 
-win32 {
+win32*msvc* {
   #configure additional directories
   INCLUDEPATH += $$(MPIRDIR)
   INCLUDEPATH += $$(MPFRDIR)
@@ -17,4 +17,4 @@ win32 {
   # lexer uses strdup() & other POSIX stuff
   QMAKE_CXXFLAGS += -D_CRT_NONSTDC_NO_DEPRECATE
 
-}
\ No newline at end of file
+}