[vlc-devel] [PATCH] package/win32: build.sh: don't require a wine installation on WSL

[Steve Lhomme]

"command -v" works as fine. I'll use that instead.

On 2020-01-31 12:46, Steve Lhomme wrote:
> On 2020-01-31 12:24, Rémi Denis-Courmont wrote:
>> Isn't "which" a Debian-ism?
> 
> I don't know but it's used in a few places in contrib/src/main.mak.
> 
>> Le 31 janvier 2020 12:24:04 GMT+02:00, Steve Lhomme <robux4 at ycbcr.xyz> 
>> a écrit :
>>
>>     No need to add a lot of packages just to run one program.
>>     
>> ------------------------------------------------------------------------
>>       extras/package/win32/build.sh | 13 +++++++++++++
>>       1 file changed, 13 insertions(+)
>>
>>     diff --git a/extras/package/win32/build.sh 
>> b/extras/package/win32/build.sh
>>     index f46fbe832b7..3163a42aff2 100755
>>     --- a/extras/package/win32/build.sh
>>     +++ b/extras/package/win32/build.sh
>>     @@ -122,6 +122,19 @@ if [ "$INTERACTIVE" != "yes" ] || [ ! -f 
>> ./Makefile ]; then
>>           NEEDED="$FORCED_TOOLS" ${SCRIPT_PATH}/../../tools/bootstrap
>>       fi
>>       make -j$JOBS
>>     +
>>     +# avoid installing wine on WSL
>>     +# wine is needed to build Qt with shaders
>>     +if test -z "`which wine`"
>>     +then
>>     +    if test -n "`which wsl.exe`"
>>     +    then
>>     +        echo "Using wsl.exe to replace wine"
>>     +        echo "#!/bin/sh" > build/bin/wine
>>     +        echo "wsl.exe \"\$@\"" >> build/bin/wine
>>     +    fi
>>     +fi
>>     +
>>       cd ../../
>>       export USE_FFMPEG=1
>>
>>
>> -- 
>> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez 
>> excuser ma brièveté.
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel