diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-11-10 10:34:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-10 16:41:41 +0000 |
| commit | b4f8480fd41a806abe04e8eb2a4c416b2eff53c6 (patch) | |
| tree | 2cac48d2759763f78cbc6becfb01d53c7a346611 /src/core/config | |
| parent | 6564daa9b75cb77a6aea02ad66298d217179a5c6 (diff) | |
Fix linking against QtANGLE library
With commit 780105f9062dec35 in qtbase, libEGL and libGLESv2 got
merged into one QtANGLE library.
Eventually qt_egl_library and qt_glesv2_library should be replaced
by a qt_angle_library, but as long as both dev and 5.8 share the
53-based branch in qtwebengine-chromium this is good enough.
We also need to support the old codepath to get the change in ...
Task-number: QTBUG-57012
Change-Id: I0775192ab0d4b2beb562e9a16b7bc258cc2ea116
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/windows.pri | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 5b9551b5a..9564cf9b7 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -19,10 +19,18 @@ GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\" GYP_ARGS += "--no-parallel" qtConfig(angle) { + #FIXME: Expect LIBQTANGLE_NAME to be always set + #FIXME: Replace qt_egl_library and qt_glesv2_library into qt_angle_library + LIB_EGL=libEGL + LIB_GLESV2=libGLESv2 + !isEmpty(LIBQTANGLE_NAME) { + LIB_EGL=$$LIBQTANGLE_NAME + LIB_GLESV2=$$LIBQTANGLE_NAME + } CONFIG(release, debug|release) { - GYP_ARGS += "-D qt_egl_library=\"libEGL.lib\" -D qt_glesv2_library=\"libGLESv2.lib\"" + GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}.lib\"" } else { - GYP_ARGS += "-D qt_egl_library=\"libEGLd.lib\" -D qt_glesv2_library=\"libGLESv2d.lib\"" + GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}d.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}d.lib\"" } GYP_ARGS += "-D qt_gl=\"angle\"" } else { |