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

[Konstantin Pavlov]

Hi,

On Tue, May 21, 2019 at 11:37:44PM +0300, Martin Storsjö wrote:
> On Tue, 21 May 2019, Pierre Lamot wrote:
> 
> > ---
> > contrib/src/fxc2/rules.mak | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
> > index e1eff83cdf..93bfbd1062 100644
> > --- a/contrib/src/fxc2/rules.mak
> > +++ b/contrib/src/fxc2/rules.mak
> > @@ -35,7 +35,7 @@ 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
> 
> LGTM

This one, and other related patches in the thread are merged.

Thank you, Pierre!

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh