vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Aug 30 
15:15:51 2018 +0200| [3fffe6ae85d01dfb6c4af8d8b513e24b9e9450eb] | committer: 
Hugo Beauzée-Luyssen

contribs: qt: Build the jpeg plugin

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

 contrib/src/qt/rules.mak | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index dd038b3ce7..03f6dc7184 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -64,6 +64,8 @@ QT_CONFIG += -release
        # Install plugins
        cd $< && $(MAKE) -C src/plugins sub-platforms-install_subtargets
 ifdef HAVE_WIN32
+       cd $< && $(MAKE) -C src/plugins sub-imageformats-install_subtargets
+       mv $(PREFIX)/plugins/imageformats/libqjpeg.a $(PREFIX)/lib/
        mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf 
$(PREFIX)/plugins
        # Vista styling
        cd $< && $(MAKE) -C src -C plugins sub-styles-install_subtargets
@@ -76,7 +78,7 @@ ifdef HAVE_WIN32
        # Fix .pc files to remove debug version (d)
        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
+       cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Gui/ -lqwindows 
-lqjpeg -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
        cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Widget/ 
-lqwindowsvistastyle -lQt5Widget/' Qt5Widgets.pc
 endif

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to