vlc | branch: master | Martin Storsjö <[email protected]> | Mon Nov 12 10:34:47 2018 +0200| [dce35a735783553035459575421a16242a4e824a] | committer: Martin Storsjö
contribs: Define WINDRES like other tools, set it in crossfile.meson > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dce35a735783553035459575421a16242a4e824a --- contrib/src/main.mak | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index c4341f9e59..d3616b5a23 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
