[vlc-devel] [PATCH 3.0 24/41] contrib: qt: disable direct2d

Steve Lhomme robux4 at ycbcr.xyz
Tue Jul 7 15:11:23 CEST 2020


From: Thomas Guillem <thomas at gllm.fr>

Because if fails to build with mingw64 5.x headers. We can remove this hack
once we increment the minimal mingw64 version (to 6).

Direct2d is only used for Qt Widgets and is not mandatory.

(cherry picked from commit a1d64468b75d1da9d097edcc569a4aebb59742ad) (rebased)

rebased:
- this branch doesn't set DXSDK_DIR since we don't use ANGLE

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qt/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 57febf3020..83f80487f8 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -70,6 +70,10 @@ QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
 
 QT_CONFIG += -release
 
+ifdef HAVE_MINGW_W64
+QT_CONFIG += -no-direct2d
+endif
+
 ENV_VARS := $(HOSTVARS)
 
 .qt: qt
-- 
2.26.2



More information about the vlc-devel mailing list