From c68b5b688db76e00126302bbac669a5639949943 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Sun, 26 May 2019 15:32:53 +0100 Subject: Reorganise files --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 57d03f1..25e1afd 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ default: build setup: mkdir -p bin -build: setup kernel/kernel.c kernel/global_descriptor_table.c kernel/io/vga/text_mode_display.c kernel/io/keyboard/keyboard_handler.c kernel/kernel-bootstrap.asm +build: setup kernel/kernel.c kernel/global_descriptor_table.c kernel/gpu/text_mode/display.c kernel/io/keyboard/keyboard_handler.c kernel/kernel-bootstrap.asm nasm -f elf32 kernel/kernel-bootstrap.asm -o bin/kernel-bootstrap.o $(CC) $(CFLAGS) -c kernel/kernel.c -o bin/kernel.o $(CC) $(CFLAGS) -c kernel/global_descriptor_table.c -o bin/global_descriptor_table.o - $(CC) $(CFLAGS) -c kernel/io/vga/text_mode_display.c -o bin/text_mode_display.o + $(CC) $(CFLAGS) -c kernel/gpu/text_mode/display.c -o bin/text_mode_display.o $(CC) $(CFLAGS) -c kernel/io/keyboard/keyboard_handler.c -o bin/keyboard_handler.o ld -m elf_i386 -T link.ld -o bin/kernel.bin bin/*.o -- cgit v1.2.3