Merge remote branch 'upstream/master'

Conflicts:
	openscad.pro

1 files changed, 3 insertions, 3 deletions

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
+}