diff options
| author | Benji Dial <Benji3.141@gmail.com> | 2019-12-23 01:33:26 -0500 |
|---|---|---|
| committer | Benji Dial <Benji3.141@gmail.com> | 2019-12-23 01:33:26 -0500 |
| commit | e520b52cd58f70af9a17f330fe1ce98ce059762c (patch) | |
| tree | a4d8ec52453b0a8f872aea1ab3c4c5867543c90c /makefile | |
| parent | 4edc0cb2313541e74026c25b52a8f9685d953a14 (diff) | |
| download | portland-os-e520b52cd58f70af9a17f330fe1ce98ce059762c.tar.gz | |
small changes, part 1
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -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 |