[vlc-commits] Contribs: D3D, use wine headers when Xcompilign

Jean-Baptiste Kempf git at videolan.org
Wed Oct 21 19:52:38 CEST 2015


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

Contribs: D3D, use wine headers when Xcompilign

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

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

 contrib/src/d3d11/rules.mak |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index 92f5ca1..7d6be2d 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -1,7 +1,11 @@
 # generate Direct3D11 temporary include
 
+ifdef HAVE_CROSS_COMPILE
+IDL_INC_PATH = /usr/include/wine/windows/
+else
 #ugly way to get the default location of standard idl files
 IDL_INC_PATH = /`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include
+endif
 
 D3D11_IDL_URL :=http://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/direct-x/include/d3d11.idl?format=raw
 DST_D3D11_H = $(PREFIX)/include/d3d11.h



More information about the vlc-commits mailing list