diff options
| author | Marius Kintel <marius@kintel.net> | 2012-06-04 05:47:07 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-06-04 05:47:07 (GMT) |
| commit | 6f65f92c6707147dd676094a98bdf715557bcb58 (patch) | |
| tree | 010619e32e7062112246b14b29647b8cf04349dc | |
| parent | bcf02d6013b07bf3481a6b725568fbe5039e34a9 (diff) | |
| parent | 2af483e14f3219077ca32f171e83c38da02535d2 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | openscad.pro | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/openscad.pro b/openscad.pro index 453ab77..591ed5f 100644 --- a/openscad.pro +++ b/openscad.pro @@ -81,9 +81,13 @@ win32 { CONFIG += qt QT += opengl -# Fedora Linux + DSO fix -linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) { - LIBS += -lGLU +# see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange +# and https://github.com/openscad/openscad/pull/119 +# ( QT += opengl does not automatically link glu on some DSO systems. ) +unix:!macx { + !contains ( QMAKE_LIBS_OPENGL, "-lGLU" ) { + QMAKE_LIBS_OPENGL += -lGLU + } } netbsd* { |