[vlc-devel] [PATCH 2/3] contribs: qt: Install qmake even when building natively
Hugo Beauzée-Luyssen
hugo at beauzee.fr
Mon Oct 8 18:31:57 CEST 2018
This ensures the qmake we will use knows about the modules we install
---
contrib/src/qt/rules.mak | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index eb2b406d88..f673e6a7b0 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -97,5 +97,8 @@ ifdef HAVE_CROSS_COMPILE
for i in bootstrap uic rcc moc; \
do (cd $$i; echo $$i && ../../../bin/qmake -spec $(QT_SPEC) QMAKE_RC=$(HOST)-windres && $(MAKE) clean && $(MAKE) CC=$(HOST)-gcc CXX=$(HOST)-g++ LINKER=$(HOST)-g++ LIB="$(HOST)-ar -rc" && $(MAKE) install); \
done
+else
+ # Install a qmake with correct paths set
+ cd $<; $(MAKE) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
endif
touch $@
--
2.19.0
More information about the vlc-devel
mailing list