From 8e4978fe0456f0100a5fcd6927dde0d65cab67db Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 11 Jul 2021 19:51:32 +0200 Subject: [PATCH] Meta: Use the SDL backend for QEMU on Windows --- Meta/run.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Meta/run.sh b/Meta/run.sh index bc8c1b40c3..32a9ee2221 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -87,11 +87,12 @@ if [ "$installed_major_version" -lt "$SERENITY_QEMU_MIN_REQ_VERSION" ]; then fi SERENITY_SCREENS="${SERENITY_SCREENS:-1}" -if [ $SERENITY_SCREENS = 1 ]; then - SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=on}" -elif (uname -a | grep -iq WSL) || (uname -a | grep -iq microsoft); 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 + # Also, when using the GTK backend we run into this problem: https://github.com/SerenityOS/serenity/issues/7657 SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-sdl,gl=off}" +elif [ $SERENITY_SCREENS = 1 ]; then + SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=on}" elif ("${SERENITY_QEMU_BIN}" --display help | grep -iq sdl) && (ldconfig -p | grep -iq virglrenderer); then SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-sdl,gl=on}" elif "${SERENITY_QEMU_BIN}" --display help | grep -iq cocoa; then