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

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Mon Nov 12 10:34:47 2018 +0200| [28408ab437a2b0d8f6acbaef0fd2582493b242b6] | committer: Hugo Beauzée-Luyssen

contribs: Define WINDRES like other tools, set it in crossfile.meson

(cherry picked from commit dce35a735783553035459575421a16242a4e824a)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 304bdaa432..d96f70f96d 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
@@ -529,6 +535,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