From c055a2f6a9778f93a8f09b6d820d2504d3fa2601 Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Thu, 26 Dec 2019 18:21:44 -0500 Subject: keyboard skeleton, skeleton, rcs, etc --- makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 8ff2c69..c126c46 100644 --- a/makefile +++ b/makefile @@ -1,27 +1,32 @@ -cd: kernel fs +cd: files grub + grub2-mkrescue out/fs -o out/cd.iso --product-name=portland --product-version=0.0.9 + +grub: kernel mkdir -p out/fs/boot/grub mv out/kernel.elf out/fs/boot/ cp src/grub.cfg out/fs/boot/grub/ - grub2-mkrescue out/fs -o out/cd.iso --product-name=portland --product-version=0.0.9 + +files: out + mkdir -p out/fs + 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/files.c -o obj/kfiles.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/kstub.o obj/kfiles.o obj/kmain.o obj/kmem.o obj/kproc.o obj/kserial.o obj/kvga.o \ + ld obj/kkeyba.o obj/kstub.o obj/kfiles.o obj/kkeybc.o obj/kmain.o \ + obj/kmem.o obj/kproc.o obj/kserial.o obj/kvga.o \ -o out/kernel.elf -T src/kernel/link.ld -s --orphan-handling=discard -melf_i386 - clean: rm -r obj out -fs: out - mkdir -p out/fs - obj: mkdir -p obj -- cgit v1.2.3