summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jason.barron@nokia.com>2012-03-31 12:41:00 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-11 12:37:34 +0200
commit9cdfeb2b84bcdb4f9dd5060283c0745224a7c58d (patch)
tree31f90aee184073aef3c1634a778af37a7656ce4e
parent3f9a7f955708be6152e98132cf34e4738365c173 (diff)
Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CM
The naming convention for these libraries says that libGLES_CM is to be used when EGL is included while libGLESv1_CM should be used when EGL is not included. Since we have a seperate variable for libEGL, it makes sense to have this variable represent the non-EGL version of the library. Change-Id: I9147c116da7be4a296a0ebeac39762b46725f10e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--mkspecs/common/linux.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index fd10785079..064d16c359 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -30,7 +30,7 @@ QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL
QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
+QMAKE_LIBS_OPENGL_ES1 = -lGLESv1_CM
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
QMAKE_LIBS_OPENVG = -lOpenVG
QMAKE_LIBS_THREAD = -lpthread