diff --git a/Makefile b/Makefile index a9a039bff372a7dfe8eea88e0eb8cbc55b9f7a8a..d9112106a9d53fa01f8bc9ec5a6598d291f57f8c 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ CPP_Linux=g++ LD_Linux=ld COMPOP_Linux=-fno-stack-protector -m32 LIEUR_Linux=-m elf_i386 +QEMU=qemu-system-i386 #------------------- ##POUR WINDOWS @@ -76,8 +77,18 @@ clean: $(DELE) *.s $(DELE) build/boot/*.elf -run: - cd build/boot && qemu -no-kvm -M isapc -L "/usr/share/qemu" -net nic,model=ne2k_isa -net user -tftp ./ -cdrom grub.iso -soundhw pcspk -m 4 +run: $(KERNEL_OBJ) + $(QEMU) -display curses -net nic,model=ne2k_isa -net user,tftp=./build/boot -cdrom ./build/boot/grub.iso + +run_gui: $(KERNEL_OBJ) + $(QEMU) -net nic,model=ne2k_isa -net user,tftp=./build/boot -cdrom ./build/boot/grub.iso + +debug: $(KERNEL_OBJ) + $(QEMU) -display curses -S -s -net nic,model=ne2k_isa -net user,tftp=./build/boot -cdrom ./build/boot/grub.iso + +debug_gui: $(KERNEL_OBJ) + $(QEMU) -S -s -net nic,model=ne2k_isa -net user,tftp=./build/boot -cdrom ./build/boot/grub.iso + show: @echo "objects:$(OBJECTS)"