From a7ebe941998768fe1015fc1b6d528690bdf19701 Mon Sep 17 00:00:00 2001 From: Don Bright Date: Fri, 16 Dec 2011 21:03:10 -0600 Subject: fix qmake under mingw-cross-compile 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 +} -- cgit v0.10.1