[vlc-commits] Qt: try to fix linking with Qt 5.11

Jean-Baptiste Kempf git at videolan.org
Tue Jun 19 09:44:04 CEST 2018


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jun 19 09:43:26 2018 +0200| [5a578ef9579cead7203d0bbe1eaacb24f793b201] | committer: Jean-Baptiste Kempf

Qt: try to fix linking with Qt 5.11

-ldwmapi needs to be after -lqwindows

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

 contrib/src/qt/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 1ec0fcdda6..3b56febcb5 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -67,7 +67,7 @@ QT_CONFIG += -release
 	# Fix .pc files to remove debug version (d)
 	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 -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport -lQt5WindowsUIAutomationSupport -lqtfreetype -lQt5Gui/g' Qt5Gui.pc
+	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Gui/ -lqwindows -ldwmapi -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport -lQt5WindowsUIAutomationSupport -lqtfreetype -lQt5Gui/g' Qt5Gui.pc
 ifdef HAVE_CROSS_COMPILE
 	# Building Qt build tools for Xcompilation
 	cd $</include/QtCore; ln -sf $(QT_VERSION)/QtCore/private



More information about the vlc-commits mailing list