diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-17 18:56:50 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-17 18:56:50 (GMT) |
| commit | ee2cdb6489121ab5f77522053fd4142fb06a6f2b (patch) | |
| tree | e388bfab01a0ffbd039132f319ba517799fd1f1f /openscad.pro | |
| parent | cae91b57cf839ee7b8902ca8b47efd1dd6875121 (diff) | |
| parent | ef29553226ddb3f8f0565dbd6004d76e26c80ddc (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
openscad.pro
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/openscad.pro b/openscad.pro index 60870be..e38251a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -40,7 +40,7 @@ INCLUDEPATH += src # Used when manually installing 3rd party libraries OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES) !isEmpty(OPENSCAD_LIBDIR) { - INCLUDEPATH = $$OPENSCAD_LIBDIR/include $$INCLUDEPATH + QMAKE_INCDIR_QT = $$OPENSCAD_LIBDIR/include $$QMAKE_INCDIR_QT QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib $$QMAKE_LIBDIR } else { @@ -77,6 +77,15 @@ win32 { CONFIG += qt QT += opengl +# Fedora Linux + DSO fix +linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) { + LIBS += -lGLU +} + +CONFIG(mingw-cross-env) { + include(mingw-cross-env.pri) +} + # Application configuration macx:CONFIG += mdi CONFIG += cgal |