[vlc-devel] [PATCH] contribs: Define WINDRES like other tools, set it in crossfile.meson

Martin Storsjö martin at martin.st
Mon Nov 12 09:35:16 CET 2018


---
 contrib/src/main.mak | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c4341f9..d3616b5 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -79,6 +79,9 @@ endif
 ifneq ($(findstring $(origin WIDL),undefined default),)
 WIDL := widl
 endif
+ifneq ($(findstring $(origin WINDRES),undefined default),)
+WINDRES := windres
+endif
 else
 ifneq ($(findstring $(origin CC),undefined default),)
 CC := $(HOST)-gcc
@@ -101,6 +104,9 @@ endif
 ifneq ($(findstring $(origin WIDL),undefined default),)
 WIDL := $(HOST)-widl
 endif
+ifneq ($(findstring $(origin WINDRES),undefined default),)
+WINDRES := $(HOST)-windres
+endif
 endif
 
 ifdef HAVE_ANDROID
@@ -541,6 +547,7 @@ crossfile.meson:
 	echo "ar = '$(AR)'" >> $@
 	echo "strip = '$(STRIP)'" >> $@
 	echo "pkgconfig = '$(PKG_CONFIG)'" >> $@
+	echo "windres = '$(WINDRES)'" >> $@
 	echo "[properties]" >> $@
 	echo "needs_exe_wrapper = true" >> $@
 ifdef HAVE_CROSS_COMPILE
-- 
2.7.4



More information about the vlc-devel mailing list