From 1549bc086d04277d562e467ff19363c99005e375 Mon Sep 17 00:00:00 2001 From: cody Date: Fri, 15 Aug 2025 08:35:34 +0800 Subject: [PATCH] 1. Fixed an SDL error that occurred when launching QEMU on macOS with VGUI=y enabled. 2. Added the dryrun option. --- .gitignore | 3 ++- Makefile | 6 +++++- src/platform/i386/cmd.mk | 13 +++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0bb6e87..39b18c4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ src/platform/Kconfig src/include/nx_configure.h platform.mk rootfs.cpio -rootfs.img \ No newline at end of file +rootfs.img +.DS_Store diff --git a/Makefile b/Makefile index 44c0a50..b9b06ed 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,8 @@ CONFIG_IN_FILE = .config # # Cmds # -.PHONY: all clean run prepare menuconfig defconfig saveconfig gdb cleanAll +.PHONY: all clean run dryrun prepare menuconfig defconfig saveconfig gdb cleanAll + # # Compile only @@ -138,6 +139,9 @@ endif run: all @$(MAKE) -s -C src/platform/$(PLATFORM) -f cmd.mk run +dryrun: + @$(MAKE) -s -C src/platform/$(PLATFORM) -f cmd.mk dryrun + # # GDB command # diff --git a/src/platform/i386/cmd.mk b/src/platform/i386/cmd.mk index 5aaf018..8f0d854 100644 --- a/src/platform/i386/cmd.mk +++ b/src/platform/i386/cmd.mk @@ -112,7 +112,11 @@ ifeq ($(GUI),y) else ifeq ($(VGUI),y) - QEMU_ARGS += -display sdl -vga virtio + ifeq ($(shell uname),Darwin) + QEMU_ARGS += -display default -vga virtio + else + QEMU_ARGS += -display sdl -vga virtio + endif else QEMU_ARGS += -nographic endif @@ -147,7 +151,7 @@ endif # # Args for make # -.PHONY: run clean +.PHONY: run dryrun clean # # Run OS in QEMU @@ -156,6 +160,11 @@ run: @$(MAKE) -s -C $(GRUB_DIR) KERNEL=$(NXOS_NAME).elf OS_NAME=$(NXOS_NAME) $(QEMU) $(QEMU_ARGS) +# +# Dry Run OS in QEMU +# +dryrun: + $(QEMU) $(QEMU_ARGS) # # Clear target file # -- Gitee