From eed6adb6fcf9e30332e37030c6b783923eb7f29a Mon Sep 17 00:00:00 2001 From: Gal Horowitz Date: Tue, 29 Jun 2021 15:53:00 +0300 Subject: [PATCH] Meta: Do not use gl=on if building in WSL2 The existing check only detects WSL1, this adds a new check which also detects WSL2. --- Meta/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meta/run.sh b/Meta/run.sh index 38d832a958..8f0a3fe3b0 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -54,7 +54,7 @@ installed_major_version=$("$SERENITY_QEMU_BIN" -version | head -n 1 | sed -E 's/ [ "$installed_major_version" -lt "$SERENITY_QEMU_MIN_REQ_VERSION" ] && die "Required QEMU >= 5.0! Found $($SERENITY_QEMU_BIN -version | head -n 1)" SERENITY_SCREENS="${SERENITY_SCREENS:-1}" -if uname -a | grep -iq WSL; then +if (uname -a | grep -iq WSL) || (uname -a | grep -iq microsoft); then # QEMU for windows does not like gl=on, so detect if we are building in wsl, and if so, disable it SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-sdl,gl=off}" elif ("${SERENITY_QEMU_BIN}" --display help | grep -iq sdl) && (ldconfig -p | grep -iq virglrenderer); then