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

[Martin Storsjö]

On Thu, 16 May 2019, Pierre Lamot wrote:

> ---
> 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
> -- 
> 2.17.1

LGTM, this matches my intent here.

// Martin