[vlc-devel] [PATCH 2/2] contrib/QtSvg: fix cross compilation for win32
Pierre Lamot
pierre at videolabs.io
Fri Oct 13 16:56:15 CEST 2017
* set QtScg as a requirement on windows
* fix link compilation order for mingw
---
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
--
2.14.2
More information about the vlc-devel
mailing list