From 7c7fd36bea1eac4d0fa7bd628a53fff7d2e60917 Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Fri, 27 Dec 2019 18:49:11 -0500 Subject: doing iso9660 before gpt, making partition detection expandable --- makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 5c0eedd..bd6c5f0 100644 --- a/makefile +++ b/makefile @@ -11,19 +11,20 @@ files: out cp -r src/skel/* out/fs/ kernel: obj out - nasm src/kernel/keyb.asm -o obj/kkeyba.o -f elf32 - nasm src/kernel/serial.asm -o obj/kserial.o -f elf32 - nasm src/kernel/stub.asm -o obj/kstub.o -f elf32 - gcc -c src/kernel/diskio.c -o obj/kdiskio.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/files.c -o obj/kfiles.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/gpt.c -o obj/kgpt.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/keyb.c -o obj/kkeybc.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/main.c -o obj/kmain.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/mem.c -o obj/kmem.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/proc.c -o obj/kproc.o -ffreestanding -nostdlib -m32 - gcc -c src/kernel/vga.c -o obj/kvga.o -ffreestanding -nostdlib -m32 + nasm src/kernel/keyb.asm -o obj/kkeyba.o -f elf32 + nasm src/kernel/serial.asm -o obj/kserial.o -f elf32 + nasm src/kernel/stub.asm -o obj/kstub.o -f elf32 + gcc -c src/kernel/diskio.c -o obj/kdiskio.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/files.c -o obj/kfiles.o -ffreestanding -nostdlib -m32 + #gcc -c src/kernel/gpt.c -o obj/kgpt.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/iso9660.c -o obj/kiso9660.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/keyb.c -o obj/kkeybc.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/main.c -o obj/kmain.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/mem.c -o obj/kmem.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/proc.c -o obj/kproc.o -ffreestanding -nostdlib -m32 + gcc -c src/kernel/vga.c -o obj/kvga.o -ffreestanding -nostdlib -m32 ld obj/kkeyba.o obj/kserial.o obj/kstub.o obj/kdiskio.o obj/kfiles.o \ - obj/kgpt.o obj/kkeybc.o obj/kmain.o obj/kmem.o obj/kproc.o obj/kvga.o \ + obj/kiso9660.o obj/kkeybc.o obj/kmain.o obj/kmem.o obj/kproc.o obj/kvga.o \ -o out/kernel.elf -T src/kernel/link.ld -s --orphan-handling=discard -melf_i386 clean: -- cgit v1.2.3