Merge pull request #1550 from openscad/issue1545

Link to GLU and X11 also when using QOpenGLWidget (fixes #1545).
This commit is contained in:
Marius Kintel 2016-01-10 15:52:27 -05:00
commit f460ca231a

View file

@ -11,11 +11,12 @@ using_qopenglwidget {
else {
message("Using QGLWidget")
QT += opengl
# 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 {
QMAKE_LIBS_OPENGL *= -lGLU
QMAKE_LIBS_OPENGL *= -lX11
}
}
# 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 {
QMAKE_LIBS_OPENGL *= -lGLU
QMAKE_LIBS_OPENGL *= -lX11
}