diff options
| author | Marius Kintel <marius@kintel.net> | 2012-06-04 05:37:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-06-04 05:37:40 (GMT) |
| commit | 2af483e14f3219077ca32f171e83c38da02535d2 (patch) | |
| tree | c462aef6ce00b803f48ee2a9e6685298288aa76d | |
| parent | 45c86b5a5a227447bd58ee4484ab1b3dae1e8f01 (diff) | |
| parent | c2f19f450b037fb28a269ad2ff5c228dfa6d5dad (diff) | |
Merge pull request #120 from openscad/glufix
more reliable way of ensuring GLU is linked on new DSO linux systems.
| -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* { |