File structure refactor

3 years ago · aa38917ca8
parent ddd2287711
commit aa38917ca8
14 changed files with 2 additions and 2 deletions
--- a/compile.sh
+++ b/compile.sh
@ -7,10 +7,10 @@ srcDir=src
 binDir=bin

 echo "Compiling bootloader... "
-nasm -f bin $srcDir/bootloader.asm -i $srcDir -o $binDir/bootloader.bin 
+nasm -f bin $srcDir/bootloader/bootloader.asm -i $srcDir/bootloader -o $binDir/bootloader.bin 

 echo "Compiling kernel... "
-gcc -fno-pie -m32 -Os -ffreestanding -c $srcDir/kernel.c -o $binDir/kernel.o && gcc -o $binDir/kernel.bin $binDir/kernel.o -Wl,--oformat=binary -ffreestanding -nostdlib -shared -Ttext 0x1000 -m32 
+gcc -fno-pie -m32 -Os -ffreestanding -c $srcDir/kernel/kernel.c -o $binDir/kernel.o && gcc -o $binDir/kernel.bin $binDir/kernel.o -Wl,--oformat=binary -ffreestanding -nostdlib -shared -Ttext 0x1000 -m32 

 echo "Creating OS image... "
 cat $binDir/bootloader.bin $binDir/kernel.bin > $binDir/os-image 
--- a/src/bootloader/bios.asm
+++ b/src/bootloader/bios.asm
--- a/src/bootloader/bios/convert.asm
+++ b/src/bootloader/bios/convert.asm
--- a/src/bootloader/bios/disk.asm
+++ b/src/bootloader/bios/disk.asm
--- a/src/bootloader/bios/print.asm
+++ b/src/bootloader/bios/print.asm
--- a/src/bootloader/bootloader.asm
+++ b/src/bootloader/bootloader.asm
--- a/src/bootloader/equ/ascii.asm
+++ b/src/bootloader/equ/ascii.asm
--- a/src/bootloader/equ/bios.asm
+++ b/src/bootloader/equ/bios.asm
--- a/src/bootloader/equ/vga.asm
+++ b/src/bootloader/equ/vga.asm
--- a/src/bootloader/pm.asm
+++ b/src/bootloader/pm.asm
--- a/src/bootloader/pm/gdt.asm
+++ b/src/bootloader/pm/gdt.asm
--- a/src/bootloader/pm/vga/print.asm
+++ b/src/bootloader/pm/vga/print.asm
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
--- a/src/kernel/lib/vga.c
+++ b/src/kernel/lib/vga.c