[vlc-commits] contrib: fxc2 only check compiler when building for windows

Pierre Lamot git at videolan.org
Wed May 22 12:25:33 CEST 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu May 16 09:40:40 2019 +0200| [8d3e4f6905c7efadd2effd4f45011bd38d0d65f9] | committer: Konstantin Pavlov

contrib: fxc2 only check compiler when building for windows

Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

 contrib/src/fxc2/rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index e1eff83cdf..18c0d0128a 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -22,6 +22,7 @@ fxc2: fxc2-$(FXC2_VERSION).tar.xz .sum-fxc2
 	$(APPLY) $(SRC)/fxc2/0004-Revert-Fix-narrowing-conversion-from-int-to-BYTE.patch
 	$(MOVE)
 
+ifdef HAVE_WIN32
 ifeq ($(ARCH),x86_64)
 FXC2_CXX=$(CXX)
 FXC2_DLL=dll/d3dcompiler_47.dll
@@ -37,7 +38,7 @@ FXC2_DLL=dll/d3dcompiler_47_32.dll
 else
 $(error No x86 (cross) compiler found for fxc2)
 endif
-
+endif
 
 .fxc2: fxc2 crossfile.meson
 	cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe



More information about the vlc-commits mailing list