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

[Rémi Denis-Courmont]

Looks good, but aren't those two separate issues?

Le 16 mai 2019 12:14:47 GMT+03:00, Pierre Lamot <pierre at videolabs.io> a écrit :
>  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
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20190516/e9ecd46f/attachment.html>