diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
| commit | 0d619e5ac155e37c432d57062d8224a58c9d59ab (patch) | |
| tree | 10183df17cd4786ee1ef43b95c988fefd13ca990 /openscad.pro | |
| parent | aa8aee623adc74cbfe87f9e92e30be4a9ed3a7c8 (diff) | |
| parent | b028b704e029a5161d3703efda35642a37c28cb6 (diff) | |
Merge branch 'master' into linear_extrude_argument
Diffstat (limited to 'openscad.pro')
| -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* { |