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

Steve Lhomme git at videolan.org
Fri Feb 14 13:36:19 CET 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jan 31 11:20:54 2020 +0100| [803f18544377610101472a143af6a98c0f59cbee] | committer: Steve Lhomme

package/win32: build.sh: don't require a wine installation on WSL

No need to add a lot of packages just to run one program.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=803f18544377610101472a143af6a98c0f59cbee
---

 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 f46fbe832b..8ba190df69 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 "`command -v wine`"
+then
+    if test -n "`command -v 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



More information about the vlc-commits mailing list