Cleanup

2025-09-08 20:10:04 -04:00 · 2013-10-27 15:54:50 +01:00 · 2013-10-27 15:54:50 +01:00 · ea96e01821
commit ea96e01821
parent f259192f23
13 changed files with 5 additions and 4 deletions
--- a/7
+++ b/7
@ -3,8 +3,8 @@ default: thor.flp
 KERNEL_SRC=$(wildcard src/*.asm)
 KERNEL_UTILS_SRC=$(wildcard src/utils/*.asm)

-bootloader.bin: src/bootloader/bootloader.asm
-	nasm -w+all -f bin -o bootloader.bin src/bootloader/bootloader.asm
+bootloader.bin: bootloader/bootloader.asm
+	nasm -w+all -f bin -o bootloader.bin bootloader/bootloader.asm

 micro_kernel.bin: $(KERNEL_SRC) $(KERNEL_UTILS_SRC)
 	nasm -w+all -f bin -o micro_kernel.bin src/micro_kernel.asm
@ -36,4 +36,5 @@ bochs: thor.flp
 clean:
 	rm -f *.bin
 	rm -f *.flp
-	rm -f *.o
+	rm -f *.o
+	rm -f *.g
--- a/src/bootloader/bootloader.asm
+++ b/src/bootloader/bootloader.asm
@ -2,7 +2,7 @@

 jmp rm_start

-%include "src/bootloader/intel_16.asm"
+%include "bootloader/intel_16.asm"

 ; Start in real mode
 rm_start:
--- a/src/bootloader/intel_16.asm
+++ b/src/bootloader/intel_16.asm
--- a/micro_kernel.g
+++ b/micro_kernel.g
--- a/micro_kernel/commands.asm
+++ b/micro_kernel/commands.asm
--- a/micro_kernel/interrupts.asm
+++ b/micro_kernel/interrupts.asm
--- a/micro_kernel/micro_kernel.asm
+++ b/micro_kernel/micro_kernel.asm
--- a/micro_kernel/shell.asm
+++ b/micro_kernel/shell.asm
--- a/micro_kernel/timer.asm
+++ b/micro_kernel/timer.asm
--- a/micro_kernel/utils/console.asm
+++ b/micro_kernel/utils/console.asm
--- a/micro_kernel/utils/keyboard.asm
+++ b/micro_kernel/utils/keyboard.asm
--- a/micro_kernel/utils/macros.asm
+++ b/micro_kernel/utils/macros.asm
--- a/micro_kernel/utils/utils.asm
+++ b/micro_kernel/utils/utils.asm