summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 51493cd..040c846 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@ KOBJ_FILES = $(KERNEL_ASM_OBJ) \
$(KERNEL_OBJ) \
./build/vga.o \
./build/idt/idt.asm.o \
- ./build/idt/idt.o
+ ./build/idt/idt.o \
+ ./build/io/io.asm.o
BOOT_TGT =./bin/boot.bin
@@ -57,6 +58,8 @@ $(BUILD_DIR)/idt/idt.asm.o: ./src/idt/idt.asm
$(BUILD_DIR)/idt/idt.o: ./src/idt/idt.c ./build/vga.o $(KOBJ_LIBS)
i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/idt/idt.c -o $(BUILD_DIR)/idt/idt.o
+$(BUILD_DIR)/io/io.asm.o: ./src/io/io.asm
+ nasm -f elf -g ./src/io/io.asm -o $(BUILD_DIR)/io/io.asm.o
$(KOBJ_LIBS):
i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/lib/string.c -o $(BUILD_DIR)/string.o
@@ -70,4 +73,5 @@ clean:
rm -f build/string.o
rm -f build/idt/idt.asm.o
rm -f build/idt/idt.o
+ rm -f build/io/io.asm.o
rm -f bin/os.bin