diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-04 10:15:23 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-11 08:35:54 +0000 |
commit | 3f1548ae82d4321b6fdbbf127dafbdf385374be0 (patch) | |
tree | 192268eed3cb0fea123e93c721d9319f372991fb /mkspecs/common | |
parent | 67f466505e1aed6b7f87e766141d081146b4159c (diff) |
Restore behavior of using libEGL and libGLESv2 as default for angle
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 <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/angle.conf | 13 | ||||
-rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/windows-gles.conf | 7 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 2 |
4 files changed, 15 insertions, 9 deletions
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) |