From 955acdacba0de84a690b435321f5d7b22965b542 Mon Sep 17 00:00:00 2001
From: Nero <41307858+nero@users.noreply.github.com>
Date: Mon, 30 Mar 2020 12:13:21 +0000
Subject: [PATCH] Split code up into directories for bs and com binaries

---
 Makefile                        | 4 ++--
 fat.asm => boot/fat.asm         | 0
 fat32.asm => boot/fat32.asm     | 0
 kernel.asm => boot/kernel.asm   | 0
 mbr.asm => boot/mbr.asm         | 0
 pxeboot.asm => boot/pxeboot.asm | 0
 serial.asm => boot/serial.asm   | 0
 vga11.asm => boot/vga11.asm     | 0
 hello.asm => com/hello.asm      | 0
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename fat.asm => boot/fat.asm (100%)
 rename fat32.asm => boot/fat32.asm (100%)
 rename kernel.asm => boot/kernel.asm (100%)
 rename mbr.asm => boot/mbr.asm (100%)
 rename pxeboot.asm => boot/pxeboot.asm (100%)
 rename serial.asm => boot/serial.asm (100%)
 rename vga11.asm => boot/vga11.asm (100%)
 rename hello.asm => com/hello.asm (100%)

diff --git a/Makefile b/Makefile
index 2e1165b..519d28a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,11 @@ cp437.bin: cp437.bmp utils/bmp2font
 vga11.com: cp437.bin
 
 # COM programs
-%.com: %.asm
+%.com: com/%.asm
 	$(NASM) $(NASM_ARGS) -DBASE=0x0100 -DCOM -o $@ $<
 
 # Bootloaders, first sector on partition
-%.bs: %.asm
+%.bs: boot/%.asm
 	$(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DBOOT -o $@ $<
 
 # BIOS option roms
diff --git a/fat.asm b/boot/fat.asm
similarity index 100%
rename from fat.asm
rename to boot/fat.asm
diff --git a/fat32.asm b/boot/fat32.asm
similarity index 100%
rename from fat32.asm
rename to boot/fat32.asm
diff --git a/kernel.asm b/boot/kernel.asm
similarity index 100%
rename from kernel.asm
rename to boot/kernel.asm
diff --git a/mbr.asm b/boot/mbr.asm
similarity index 100%
rename from mbr.asm
rename to boot/mbr.asm
diff --git a/pxeboot.asm b/boot/pxeboot.asm
similarity index 100%
rename from pxeboot.asm
rename to boot/pxeboot.asm
diff --git a/serial.asm b/boot/serial.asm
similarity index 100%
rename from serial.asm
rename to boot/serial.asm
diff --git a/vga11.asm b/boot/vga11.asm
similarity index 100%
rename from vga11.asm
rename to boot/vga11.asm
diff --git a/hello.asm b/com/hello.asm
similarity index 100%
rename from hello.asm
rename to com/hello.asm