Added 32 nasm flag and fixed clean Make directive
This commit is contained in:
parent
217893ec9d
commit
6e5f0a4089
5
Makefile
5
Makefile
|
@ -40,7 +40,7 @@ iso:
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf obj/ kernel/*.o kernel/cpu/*.o
|
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 kernel/drivers/*.o kernel/libc/*.o
|
||||||
rm -rf iceOS.iso bochslog.txt commands isodir
|
rm -rf iceOS.iso bochslog.txt commands isodir
|
||||||
|
|
||||||
|
@ -49,6 +49,9 @@ bochs:
|
||||||
|
|
||||||
run:
|
run:
|
||||||
qemu-system-x86_64 -cdrom iceOS.iso
|
qemu-system-x86_64 -cdrom iceOS.iso
|
||||||
|
|
||||||
|
run-debug:
|
||||||
|
qemu-system-x86_64 -cdrom iceOS.iso -d exec,cpu
|
||||||
|
|
||||||
run-curses:
|
run-curses:
|
||||||
qemu-system-x86_64 -cdrom iceOS.iso -curses
|
qemu-system-x86_64 -cdrom iceOS.iso -curses
|
||||||
|
|
|
@ -2,7 +2,7 @@ OBJS = kernel_loader.asm.o ports.asm.o \
|
||||||
gdt.asm.o idt.asm.o interrupts.asm.o
|
gdt.asm.o idt.asm.o interrupts.asm.o
|
||||||
|
|
||||||
ASM = nasm
|
ASM = nasm
|
||||||
ASMFLAGS = -f elf
|
ASMFLAGS = -f elf32
|
||||||
all: $(OBJS)
|
all: $(OBJS)
|
||||||
%.asm.o: %.asm
|
%.asm.o: %.asm
|
||||||
$(ASM) $(ASMFLAGS) $< -o $@
|
$(ASM) $(ASMFLAGS) $< -o $@
|
||||||
|
|
Loading…
Reference in New Issue