From 3f1548ae82d4321b6fdbbf127dafbdf385374be0 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 4 May 2017 10:15:23 +0200 Subject: Restore behavior of using libEGL and libGLESv2 as default for angle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As Qt applications using OpenGL are linked against these libs, merging them into QtANGLE by default (780105f9062dec350bbe2a6800c40db3e6382578) was a binary incompatible change. This change restores the default behavior to the one before given change. If the user wants the libraries to be merged, he can pass combined-angle-lib to configure. Task-number: QTBUG-60373 Change-Id: Iedbd3f2ce9284fdde924cfae8d915d6d5fef00db Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint Reviewed-by: Jan Arve Sæther Reviewed-by: Joerg Bornemann --- mkspecs/common/angle.conf | 13 +++++++++++++ mkspecs/common/msvc-desktop.conf | 2 +- mkspecs/common/windows-gles.conf | 7 ------- mkspecs/common/winrt_winphone/qmake.conf | 2 +- mkspecs/features/win32/opengl.prf | 10 ++++++++++ mkspecs/win32-g++/qmake.conf | 2 +- mkspecs/win32-icc/qmake.conf | 2 +- 7 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 mkspecs/common/angle.conf delete mode 100644 mkspecs/common/windows-gles.conf (limited to 'mkspecs') diff --git a/mkspecs/common/angle.conf b/mkspecs/common/angle.conf new file mode 100644 index 0000000000..fad0e719d2 --- /dev/null +++ b/mkspecs/common/angle.conf @@ -0,0 +1,13 @@ +# Renaming these files requires that the LIBRARY entry of their corresponding +# def files are also updated to reflect the name. +# The .def files are found in the angle directories: +# +# qtbase\src\3rdparty\angle\src\libEGL\libEGL[d?].def +# qtbase\src\3rdparty\angle\src\libEGL\libGLESv2[d?].def +# +# If a combined ANGLE library is used, the def files will automatically be +# combined into QtANGLE[d?].def by QtAngle.pro. + +LIBEGL_NAME = libEGL +LIBGLESV2_NAME = libGLESv2 +LIBQTANGLE_NAME = QtANGLE diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index d0d8869036..acc8d235a2 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -106,4 +106,4 @@ VCPROJ_EXTENSION = .vcproj VCSOLUTION_EXTENSION = .sln VCPROJ_KEYWORD = Qt4VSv1.0 -include(windows-gles.conf) +include(angle.conf) diff --git a/mkspecs/common/windows-gles.conf b/mkspecs/common/windows-gles.conf deleted file mode 100644 index 78b96c42d4..0000000000 --- a/mkspecs/common/windows-gles.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Output name of Qt's ANGLE GLES library. (Note that this is different from upstream ANGLE) -LIBQTANGLE_NAME = QtANGLE - -# Set up .lib files used for linking -QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 -QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG - diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 818264c46b..8e0aba7371 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -94,6 +94,6 @@ WINRT_ASSETS_PATH = $$PWD/assets WINRT_MANIFEST.capabilities = defaults WINRT_MANIFEST.capabilities_device = defaults -include(../windows-gles.conf) +include(../angle.conf) load(qt_config) diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index ebc29d0923..c6fba7770f 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,4 +1,14 @@ +QT_FOR_CONFIG += gui + qtConfig(opengles2) { + # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 + qtConfig(combined-angle-lib) { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 CONFIG(debug, debug|release) { diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index d6b08f5323..625758c751 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -77,7 +77,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P -include(../common/windows-gles.conf) +include(../common/angle.conf) include(../common/gcc-base.conf) load(qt_config) diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index ab0be95543..ee95f8a866 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -57,6 +57,6 @@ QMAKE_LIB = xilib /NOLOGO DSP_EXTENSION = .dsp -include(../common/windows-gles.conf) +include(../common/angle.conf) load(qt_config) -- cgit v1.2.3