vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Feb 13 19:11:39 2015 +0100| [703720d0107888a345578483e83fc6b712960657] | committer: Jean-Baptiste Kempf
Contrib: compile Qt native tools too (cherry picked from commit ab2ba6e332bdfb1143eb5079a7aef3d0b18725cd) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=703720d0107888a345578483e83fc6b712960657 --- contrib/src/qt/rules.mak | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 77e415b..93a476d 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -36,13 +36,6 @@ endif .qt: qt cd $< && ./configure $(QT_PLATFORM) -static -release -no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -opensource -confirm-license cd $< && $(MAKE) sub-src - # BUILDING QT BUILD TOOLS -ifdef HAVE_CROSS_COMPILE - cd $</src/tools; $(MAKE) clean; \ - for i in bootstrap uic rcc moc; \ - do (cd $$i; ../../../bin/qmake; $(MAKE) clean; $(MAKE)); \ - done -endif # INSTALLING LIBRARIES for lib in Widgets Gui Core; \ do install -D -- $</lib/libQt5$${lib}.a "$(PREFIX)/lib/libQt5$${lib}.a"; \ @@ -64,6 +57,14 @@ endif for i in Core Gui Widgets; \ do cat $(SRC)/qt/Qt5$${i}.pc.in | sed -e s/@@VERSION@@/$(QT_VERSION)/ | sed -e 's|@@PREFIX@@|$(PREFIX)|' > "$(PREFIX)/lib/pkgconfig/Qt5$${i}.pc"; \ done + # BUILDING QT BUILD TOOLS +ifdef HAVE_CROSS_COMPILE + cd $</include/QtCore; ln -sf $(QT_VERSION)/QtCore/private + cd $</src/tools; $(MAKE) clean; \ + for i in bootstrap uic rcc moc; \ + do (cd $$i; echo $i && ../../../bin/qmake -spec win32-g++ ; $(MAKE) clean; $(MAKE)); \ + done +endif # INSTALLING QT BUILD TOOLS install -d "$(PREFIX)/bin/" for i in rcc moc uic; \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
