diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-17 13:19:03 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-17 13:19:03 (GMT) |
| commit | 312509296d2f078a866aaa03782e70b92d772c3e (patch) | |
| tree | b4e3cebf98dfd1e7a0ff663dd18fc43b9ae0f129 /openscad.pro | |
| parent | 6aa1a6d4c8fab520d2951ccfddb141ea5825acc1 (diff) | |
| parent | 6bba101f694afa3c4d97f3507b8b805e3c552590 (diff) | |
Merge pull request #42 from donbright/qmakemod
Qmakemod
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/openscad.pro b/openscad.pro index ac4200e..e38251a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -40,8 +40,8 @@ INCLUDEPATH += src # Used when manually installing 3rd party libraries OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES) !isEmpty(OPENSCAD_LIBDIR) { - QMAKE_INCDIR += $$OPENSCAD_LIBDIR/include - QMAKE_LIBDIR += $$OPENSCAD_LIBDIR/lib + QMAKE_INCDIR_QT = $$OPENSCAD_LIBDIR/include $$QMAKE_INCDIR_QT + QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib $$QMAKE_LIBDIR } else { macx { @@ -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 |