diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-03 21:20:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 19:32:21 +0200 |
| commit | a4ec90175c76ce35688acc06cdf93e9cab886223 (patch) | |
| tree | 64d6a1424f5a18a0296f49849e35f600dbc9c275 /mkspecs/common | |
| parent | 7d4bc536a27be540516a0403e114668f9eee65bb (diff) | |
purge vestiges of opengl es 1 support
amends 0d5170256c1.
Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ios/qmake.conf | 5 | ||||
| -rw-r--r-- | mkspecs/common/linux-android.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/linux.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 1 |
5 files changed, 0 insertions, 13 deletions
diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 3c477438a3..daf66ac5ea 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -15,11 +15,6 @@ QMAKE_RANLIB = ranlib -s QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX -# No OpenGL ES1 -QMAKE_INCDIR_OPENGL_ES1 = -QMAKE_LIBDIR_OPENGL_ES1 = -QMAKE_LIBS_OPENGL_ES1 = - # OpenGL ES2 QMAKE_INCDIR_OPENGL_ES2 = QMAKE_LIBDIR_OPENGL_ES2 = diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf index b90a22ebef..fec008cb45 100644 --- a/mkspecs/common/linux-android.conf +++ b/mkspecs/common/linux-android.conf @@ -74,8 +74,6 @@ QMAKE_LIBDIR = $$ANDROID_SOURCES_CXX_STL_LIBDIR $$ANDROID_PLATFORM_PA QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_OPENGL = -QMAKE_INCDIR_OPENGL_ES1 = -QMAKE_LIBDIR_OPENGL_ES1 = QMAKE_INCDIR_OPENGL_ES2 = QMAKE_LIBDIR_OPENGL_ES2 = @@ -110,7 +108,6 @@ QMAKE_LIBS_QT_OPENGL = QMAKE_LIBS_QTOPIA = QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -QMAKE_LIBS_OPENGL_ES1 = -lGLESv1_CM QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $$QMAKE_LIBS load(qt_config) diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index c727bd9aef..98e6cefabd 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -13,8 +13,6 @@ QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = @@ -28,7 +26,6 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_OPENGL_ES1 = -lGLESv1_CM QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index e08ac9621e..0954cfd1ee 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -29,7 +29,6 @@ QMAKE_LIBS = -lm QMAKE_LIBS_NETWORK = -lsocket # OpenGL libraries have a dependency on libEGL -QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -lEGL QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL QMAKE_LIBS_EGL = -lEGL diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index 5e6e6f0421..6e2e24dbd0 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -65,7 +65,6 @@ QMAKE_LIBS_COMPAT = QMAKE_EXTENSION_STATICLIB = lib QMAKE_LIBS_EGL = libEGL.lib -QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib QMAKE_LIBS_QT_ENTRY = -lqtmain |