diff options
| author | Marius Kintel <marius@kintel.net> | 2012-06-04 09:34:27 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-06-04 09:34:27 (GMT) |
| commit | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (patch) | |
| tree | 6ca650907710971d6835732caadd4053cdc6f32a /openscad.pro | |
| parent | 6735a8841b4ca93db2c101ab89d0875b5eee51a8 (diff) | |
| parent | 9698d1d2fbe6b19573a0e483a6411a8ebd0f6947 (diff) | |
Merge branch 'master' into value
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* { |