[vlc-devel] [PATCH 3.0 09/41] contrib: qt: only run win-specific for windows

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

From: Filip Roséen <filip at atch.se>

qwindows.a will only be present if building for windows, and the other
commands are irrelevant if we are not.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

(cherry picked from commit d7eed64267dfc0713da31efb47a329adf7efffd0) (rebased)

- this branch already uses $(LN_S)

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index bc19bfb2ba..aedf354036 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -63,6 +63,7 @@ QT_CONFIG += -release
 	cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets
 	# Install plugins
 	cd $< && $(MAKE) -C src/plugins sub-platforms-install_subtargets
+ifdef HAVE_WIN32
 	mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf $(PREFIX)/plugins
 	# Move includes to match what VLC expects
 	mkdir -p $(PREFIX)/include/QtGui/qpa
@@ -73,6 +74,7 @@ QT_CONFIG += -release
 	cd $(PREFIX)/lib/pkgconfig; for i in Qt5Core.pc Qt5Gui.pc Qt5Widgets.pc; do sed -i.orig -e 's/d\.a/.a/g' -e 's/d $$/ /' $$i; done
 	# Fix Qt5Gui.pc file to include qwindows (QWindowsIntegrationPlugin) and platform support libraries
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Gui/ -lqwindows -ldwmapi -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport -lQt5WindowsUIAutomationSupport -lqtfreetype -lQt5Gui/g' Qt5Gui.pc
 	# Building Qt build tools for Xcompilation
 	cd $</include/QtCore; $(LN_S)f $(QT_VERSION)/QtCore/private private

More information about the vlc-devel mailing list