[vlc-commits] Contrib: prefix widl tool

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 17 20:56:56 2015 +0200| [aa457ac0484dc3288b7c1fe5dc397a4cf136a996] | committer: Jean-Baptiste Kempf

Contrib: prefix widl tool

(cherry picked from commit 764c24daa96c312c9fbc684bee919d9fdcbd36a3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/d3d11/rules.mak |    4 ++--
 contrib/src/main.mak        |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index a5b9c87..92f5ca1 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -20,10 +20,10 @@ $(TARBALLS)/dxgidebug.idl:
 	(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch
 
 $(DST_D3D11_H): $(TARBALLS)/d3d11.idl
-	widl -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
+	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
 $(DST_DXGIDEBUG_H): $(TARBALLS)/dxgidebug.idl
-	widl -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
+	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
 .d3d11: $(DST_D3D11_H) $(DST_DXGIDEBUG_H)
 	touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c9f409a..d3be485 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -69,6 +69,9 @@ endif
 ifneq ($(findstring $(origin STRIP),undefined default),)
 STRIP := strip
 endif
+ifneq ($(findstring $(origin WIDL),undefined default),)
+WIDL := widl
+endif
 else
 ifneq ($(findstring $(origin CC),undefined default),)
 CC := $(HOST)-gcc
@@ -88,6 +91,9 @@ endif
 ifneq ($(findstring $(origin STRIP),undefined default),)
 STRIP := $(HOST)-strip
 endif
+ifneq ($(findstring $(origin WIDL),undefined default),)
+WIDL := $(HOST)-widl
+endif
 endif
 
 ifdef HAVE_ANDROID