Added 32 nasm flag and fixed clean Make directive

This commit is contained in:
Marco Cetica 2020-08-25 01:09:22 +02:00
parent 217893ec9d
commit 6e5f0a4089
2 changed files with 5 additions and 2 deletions

View File

@ -40,7 +40,7 @@ iso:
clean:
rm -rf obj/ kernel/*.o kernel/cpu/*.o
rm -rf kernel/shell/*.o
rm -rf kernel/shell/*.o kernel/mem/*.o
rm -rf kernel/drivers/*.o kernel/libc/*.o
rm -rf iceOS.iso bochslog.txt commands isodir
@ -49,6 +49,9 @@ bochs:
run:
qemu-system-x86_64 -cdrom iceOS.iso
run-debug:
qemu-system-x86_64 -cdrom iceOS.iso -d exec,cpu
run-curses:
qemu-system-x86_64 -cdrom iceOS.iso -curses

View File

@ -2,7 +2,7 @@ OBJS = kernel_loader.asm.o ports.asm.o \
gdt.asm.o idt.asm.o interrupts.asm.o
ASM = nasm
ASMFLAGS = -f elf
ASMFLAGS = -f elf32
all: $(OBJS)
%.asm.o: %.asm
$(ASM) $(ASMFLAGS) $< -o $@