[vlc-commits] contribs: qt: Build network & testlib modules
Hugo Beauzée-Luyssen
git at videolan.org
Fri Aug 24 17:49:33 CEST 2018
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Aug 22 16:04:14 2018 +0200| [f466e9a0395d440d0a4ecd2e17be540d39398f4e] | committer: Hugo Beauzée-Luyssen
contribs: qt: Build network & testlib modules
As they are required to generate qtdeclarative's Makefile
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f466e9a0395d440d0a4ecd2e17be540d39398f4e
---
contrib/src/qt/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 5f0c8865c8..1d5a9435d3 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -58,7 +58,7 @@ QT_CONFIG += -release
cd $< && ./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
+ 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 sub-network-install_subtargets sub-testlib-install_subtargets
# Install tools
cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets
# Install plugins
@@ -74,7 +74,7 @@ ifdef HAVE_WIN32
# Clean Qt mess
rm -rf $(PREFIX)/lib/libQt5Bootstrap* $</lib/libQt5Bootstrap*
# 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
+ cd $(PREFIX)/lib/pkgconfig; for i in Qt5Core.pc Qt5Gui.pc Qt5Widgets.pc Qt5Test.pc Qt5Network.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 -luxtheme -ldwmapi -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport -lQt5WindowsUIAutomationSupport -lqtfreetype -lQt5Gui/g' Qt5Gui.pc
# Fix Qt5Widget.pc file to include qwindowsvistastyle before Qt5Widget, as it depends on it
More information about the vlc-commits
mailing list