summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'makefile')
-rw-r--r--makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/makefile b/makefile
index 2c9d11c..088a233 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
-floppy: out bootloader files
- mkfs.fat -C -f 1 -F 12 -n "PORTLAND OS" -R 4 -S 512 out/floppy.img 1440
+floppy: bootloader fs
+ mkfs.fat -C -f 1 -F 12 -n "PORTLAND OS" -R 2 -S 512 out/floppy.img 1440
mkdir out/floppy_mount
mount out/floppy.img out/floppy_mount
cp out/fs/* out/floppy_mount/
@@ -7,16 +7,13 @@ floppy: out bootloader files
dd if=obj/bootloader.bin of=out/floppy.img bs=1 seek=62 conv=notrunc
bootloader: obj
- nasm src/bootloader.bin -o obj/bootloader.bin
+ nasm src/bootloader.asm -o obj/bootloader.bin
-kernel: obj out
- gcc -c src/kernel/main.c -o obj/kmain.o -ffreestanding
- gcc -c src/kernel/vga.c -o obj/kvga.o -ffreestanding
- ld obj/kmain.o obj/kvga.o -o out/kernel.out -nostdlib --oformat=i386-aout
+kernel: fs
+ gcc src/kernel/*.c -o out/fs/kernel.sys -ffreestanding -nostdlib -m32 -T src/kernel/link.ld
-files: kernel
- mkdir out/fs
- cp out/kernel.out out/fs/kernel.sys
+fs: out
+ mkdir -p out/fs
obj:
mkdir -p obj