vlc | branch: master | Thomas Guillem <[email protected]> | Thu Apr 11 13:08:26 
2019 +0200| [a1d64468b75d1da9d097edcc569a4aebb59742ad] | committer: Thomas 
Guillem

contrib: qt: disable direct2d

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1d64468b75d1da9d097edcc569a4aebb59742ad
---

 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 c709817e55..135280f35a 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -85,6 +85,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) DXSDK_DIR=$(PREFIX)/bin
 
 .qt: qt

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to