diff --git a/Makefile b/Makefile index f87bae7..69202fa 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ LDFLAGS = -T $(shell find . -name "link.ld") -melf_i386 --sysroot=$(PWD)/sysroot AR = i686-elf-ar +TERM_EXEC = kitty --hold sh -c + c_kern_objects := $(patsubst %.c,%.o,$(shell find kernel/ -name "*.c")) asm_kern_objects := $(patsubst %.s,%.o,$(shell find kernel/ -name "*.s")) @@ -44,7 +46,7 @@ os.iso: kernel.elf grub-mkrescue -o $@ iso run: os.iso - kitty --hold sh -c "gdb kernel.elf -x util/gdbcmds" & + $(TERM_EXEC) "gdb kernel.elf -x util/gdbcmds" & qemu-system-i386 -s -cdrom os.iso #TODO: when i inevitably do add libc, this is going to fail because they have the same name as the libk objects diff --git a/util/run-qemu.sh b/util/run-qemu.sh deleted file mode 100755 index 8705a7d..0000000 --- a/util/run-qemu.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -qemu-system-i386 -s -cdrom os.iso & gdb kernel.elf -x=util/gdbcmds