[vlc-commits] Contribs: update D3D11 rules

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 18 00:27:11 2016 +0100| [ad2cb380e9b583bdef8b37db75fb6bc240307a56] | committer: Jean-Baptiste Kempf

Contribs: update D3D11 rules

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

 contrib/src/d3d11/rules.mak |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index 66a296b..07b7d4d 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -32,28 +32,32 @@ $(TARBALLS)/dxgi1_2.idl:
 
 .sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/dxgidebug.idl $(TARBALLS)/dxgi1_2.idl
 
-.sum-dxgi12: $(TARBALLS)/dxgi1_2.idl
-	(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgi12.patch
+d3d11: .sum-d3d11
+	mkdir -p $@
+	cp $(TARBALLS)/d3d11.idl $@ && cd $@ && patch -fp1 < ../$(SRC)/d3d11/processor_format.patch
 
-$(DST_D3D11_H): $(TARBALLS)/d3d11.idl .sum-d3d11
-	(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/processor_format.patch
+dxgi12: .sum-d3d11
+	mkdir -p $@
+	cp $(TARBALLS)/dxgi1_2.idl $@ && cd $@ && patch -fp1 < ../$(SRC)/d3d11/dxgi12.patch
+
+$(DST_D3D11_H): d3d11
 	mkdir -p -- "$(PREFIX)/include/"
-	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
+	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $</d3d11.idl
 
 $(DST_DXGIDEBUG_H): $(TARBALLS)/dxgidebug.idl
 	mkdir -p -- "$(PREFIX)/include/"
 	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
-$(DST_DXGI12_H): $(TARBALLS)/dxgi1_2.idl .sum-dxgi12
+$(DST_DXGI12_H): dxgi12
 	mkdir -p -- "$(PREFIX)/include/"
 	$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
 $(DST_DXGI13_H): $(SRC)/d3d11/dxgi1_3.idl $(DST_DXGI12_H)
 	mkdir -p -- "$(PREFIX)/include/"
-	$(WIDL) -DBOOL=WINBOOL -I$(TARBALLS) -I$(IDL_INC_PATH) -h -o $@ $<
+	$(WIDL) -DBOOL=WINBOOL -Idxgi12 -I$(IDL_INC_PATH) -h -o $@ $<
 
 .dxgi13: $(DST_DXGI13_H)
 	touch $@
 
-.d3d11: $(DST_D3D11_H) $(DST_DXGIDEBUG_H)
+.d3d11: $(DST_D3D11_H) $(DST_DXGIDEBUG_H) $(DST_DXGI12_H) dxgi12
 	touch $@