Merge pull request #1550 from openscad/issue1545
Link to GLU and X11 also when using QOpenGLWidget (fixes #1545).
This commit is contained in:
commit
f460ca231a
1 changed files with 8 additions and 7 deletions
15
opengl.pri
15
opengl.pri
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue