[vlc-commits] contrib/QtSvg: fix cross compilation for win32

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 13 16:56:15 2017 +0200| [b8ab4723e8558f8020795ab2cf58db37320b4452] | committer: Jean-Baptiste Kempf

contrib/QtSvg: fix cross compilation for win32

* set QtSvg as a requirement on windows
* fix link compilation order for mingw

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/qtsvg/rules.mak | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 924f6efca7..96424ca585 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -5,6 +5,10 @@ QTSVG_URL := https://download.qt.io/official_releases/qt/5.6/$(QTSVG_VERSION)/su
 
 DEPS_qtsvg += qt $(DEPS_qt)
 
+ifdef HAVE_WIN32
+PKGS += qtsvg
+endif
+
 ifeq ($(call need_pkg,"Qt5Svg"),)
 PKGS_FOUND += qtsvg
 endif
@@ -30,5 +34,5 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	cd $(PREFIX)/lib/pkgconfig; sed -i \
 		-e 's/d\.a/.a/g' \
 		-e 's/-lQt\([^ ]*\)d/-lQt\1/g' \
-		-e '/Libs:/  s/$$/ -lqsvg -lqsvgicon/ ' \
+		-e '/Libs:/  s/-lQt5Svg/-lqsvg -lqsvgicon -lQt5Svg/ ' \
 		Qt5Svg.pc