diff options
Diffstat (limited to 'src/makefile')
| -rw-r--r-- | src/makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/makefile b/src/makefile index 93f5196..5e8acb7 100644 --- a/src/makefile +++ b/src/makefile @@ -4,11 +4,10 @@ OBJCPY=../compiler/indigo_gcc/bin/x86_64-elf-objcopy INC=-Ikernel/include EMU_CORES=4 -EMU_RAM=2G +EMU_RAM=4G XRES=1024 YRES=768 -#TODO clean up make vs debug make: nasm -g -felf64 bootloader/bootloader.asm -o objects/bootloader.o @@ -32,15 +31,15 @@ endif run: - qemu-system-x86_64 -smp $(EMU_CORES) -m $(EMU_RAM) -nographic -drive format=raw,file=./indigo_os + qemu-system-x86_64 -smp $(EMU_CORES) -m $(EMU_RAM) -nographic -no-reboot -drive format=raw,file=./indigo_os gdb: indigo_os - tmux new-session -s os_gdb "qemu-system-x86_64 -smp $(EMU_CORES) -nographic -S -s -drive format=raw,file=./indigo_os -m $(EMU_RAM)"\;\ + tmux new-session -s os_gdb "qemu-system-x86_64 -smp $(EMU_CORES) -nographic -no-reboot -S -s -drive format=raw,file=./indigo_os -m $(EMU_RAM)"\;\ split-window -h "gdb -x debug/gdbinit.gdb; killall qemu-system-x86_64" run-graphical: - qemu-system-x86_64 -S -s -smp $(EMU_CORES) -serial pipe:debug/serial -device VGA,edid=on,xres=$(XRES),yres=$(YRES) -drive format=raw,file=./indigo_os &\ + qemu-system-x86_64 -S -s -smp $(EMU_CORES) -m $(EMU_RAM) -no-reboot -serial pipe:debug/serial -device VGA,edid=on,xres=$(XRES),yres=$(YRES) -drive format=raw,file=./indigo_os &\ gdb -x debug/gdbinit.gdb; killall qemu-system-x86_64 clean: @@ -50,4 +49,3 @@ clean: rm -f debug/debug_syms.o rm -f debug/serial.in rm -f debug/serial.out - rm -f indigo_os.elf |