[vlc-commits] contrib: qt: filter out contrib include when building for Windows

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Aug 21 12:46:44 2020 +0200| [5ac08192afa5de429f010e6fbadc2d4440bbacd8] | committer: Steve Lhomme

contrib: qt: filter out contrib include when building for Windows

Now that we export them in the win32 build environment they are used for
everything Qt builds. But Qt doesn't like to have pthread-GC2 in the include
path. So we use a version without -I$(PREFIX)/include.

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

 contrib/src/qt/rules.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index d70bcbc3a9..b3e7f9f4ff 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -42,6 +42,9 @@ ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
 ifdef HAVE_WIN32
+# filter out the contrib includes as Qt doesn't ike pthread-GC2 headers
+QT_VARS := CFLAGS="$(shell echo $$CFLAGS | sed 's@ -I$$(PREFIX)/include@@g')" \
+         CXXFLAGS="$(shell echo $$CXXFLAGS | sed 's@ -I$$(PREFIX)/include@@g')"
 ifdef HAVE_CLANG
 QT_SPEC := win32-clang-g++
 else
@@ -58,7 +61,7 @@ QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
 QT_CONFIG += -release
 
 .qt: qt
-	cd $< && ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX)
+	cd $< && $(QT_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX)
 	# Make && Install libraries
 	cd $< && $(MAKE)
 	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets