summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-06 00:36:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 13:36:38 +0000
commit7ee2410825cb30b7f073c69d8c32a498835f0eec (patch)
treeeecba73559774eb26623d731af2817672ae3332e /meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
parente828faf027540bc5def8b7371a959884caad9557 (diff)
downloadpoky-7ee2410825cb30b7f073c69d8c32a498835f0eec.tar.gz
qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf
upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bj<C3><B8>rn Erik Nilsen <bjorn.nilsen@nokia.com> Date: Mon Aug 9 14:07:01 2010 +0200 Remove dependency of OpenGL Utility Library (GLU). GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim (From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/linux.conf')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/linux.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
index a54135513b..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) 29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl 30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL 31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL 32QMAKE_LIBS_OPENGL = -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL 33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM 34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2