summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-04-09 08:22:32 +0200
committerKai Koehne <kai.koehne@qt.io>2020-04-09 10:25:53 +0200
commite961cc057bcd3b69bf567a7a608ca7bb450bcffb (patch)
tree1ca3e73e4eb95829995de1d537cd61c71ebc36a8
parent135d98134f4574efafe1a0302c2ecb5fb05f63fb (diff)
MinGW: Fix debug only angle builds
Fixes: QTBUG-83397 Change-Id: I89e21cc8101a17dcdb232ff5df1a76cc08842434 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: André Klitzing <aklitzing@gmail.com>
-rw-r--r--src/gui/gui.pro9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 350d4c5ee3..6e92283142 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -59,15 +59,16 @@ load(cmake_functions)
win32: CMAKE_WINDOWS_BUILD = True
qtConfig(angle) {
+ !mingw|qtConfig(debug_and_release): debug_suffix="d"
CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.$${QMAKE_EXTENSION_STATICLIB}
CMAKE_ANGLE_GLES2_DLL_RELEASE = libGLESv2.dll
CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.$${QMAKE_EXTENSION_STATICLIB}
- CMAKE_ANGLE_EGL_DLL_DEBUG = libEGLd.dll
- CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.$${QMAKE_EXTENSION_STATICLIB}
- CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2d.dll
- CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.$${QMAKE_EXTENSION_STATICLIB}
+ CMAKE_ANGLE_EGL_DLL_DEBUG = libEGL$${debug_suffix}.dll
+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGL$${debug_suffix}.$${QMAKE_EXTENSION_STATICLIB}
+ CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2$${debug_suffix}.dll
+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2$${debug_suffix}.$${QMAKE_EXTENSION_STATICLIB}
CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
} else {