mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-23 04:55:15 +00:00
Meta: Don't override SERENITY_QEMU_DISPLAY_DEVICE if it is already set
This commit is contained in:
parent
fbb798f98c
commit
3758dffd16
Notes:
sideshowbarker
2024-07-17 19:42:11 +09:00
Author: https://github.com/rallias 🔰 Commit: https://github.com/SerenityOS/serenity/commit/3758dffd16d Pull-request: https://github.com/SerenityOS/serenity/pull/12246
1 changed files with 10 additions and 8 deletions
18
Meta/run.sh
18
Meta/run.sh
|
@ -183,14 +183,16 @@ else
|
|||
SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=off}"
|
||||
fi
|
||||
|
||||
if [ "$SERENITY_SCREENS" -gt 1 ]; then
|
||||
SERENITY_QEMU_DISPLAY_DEVICE="virtio-vga,max_outputs=$SERENITY_SCREENS "
|
||||
# QEMU appears to always relay absolute mouse coordinates relative to the screen that the mouse is
|
||||
# pointed to, without any way for us to know what screen it was. So, when dealing with multiple
|
||||
# displays force using relative coordinates only
|
||||
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off"
|
||||
else
|
||||
SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 "
|
||||
if [ -z "$SERENITY_QEMU_DISPLAY_DEVICE" ]; then
|
||||
if [ "$SERENITY_SCREENS" -gt 1 ]; then
|
||||
SERENITY_QEMU_DISPLAY_DEVICE="virtio-vga,max_outputs=$SERENITY_SCREENS "
|
||||
# QEMU appears to always relay absolute mouse coordinates relative to the screen that the mouse is
|
||||
# pointed to, without any way for us to know what screen it was. So, when dealing with multiple
|
||||
# displays force using relative coordinates only
|
||||
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off"
|
||||
else
|
||||
SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 "
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if SERENITY_NVME_ENABLE is unset
|
||||
|
|
Loading…
Add table
Reference in a new issue