[vlc-devel] [PATCH] contrib: fxc2 don't raise and error when no win compiler is present and fxc isn't compiled

Pierre Lamot pierre at videolabs.io
Thu May 16 11:14:47 CEST 2019


  remove legacy dependecy uppon meson cross file
---
 contrib/src/fxc2/rules.mak | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index e1eff83cdf..57e4438434 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -35,11 +35,10 @@ else ifeq ($(shell which i686-w64-mingw32-g++ >/dev/null 2>&1 || echo FAIL),)
 FXC2_CXX=i686-w64-mingw32-g++
 FXC2_DLL=dll/d3dcompiler_47_32.dll
 else
-$(error No x86 (cross) compiler found for fxc2)
+FXC2_CXX=$(error No x86 (cross) compiler found for fxc2)
 endif
 
-
-.fxc2: fxc2 crossfile.meson
+.fxc2: fxc2
 	cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe
 	cd $< && mkdir -p $(PREFIX)/bin && cp fxc2.exe $(PREFIX)/bin && cp $(FXC2_DLL) $(PREFIX)/bin/d3dcompiler_47.dll
 	touch $@
-- 
2.17.1



More information about the vlc-devel mailing list