From 81df4702c424f91cca5570ab2554d1d4cbae534d Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Wed, 3 Mar 2021 22:43:17 -0500 Subject: 64kiB kernel area, ps/2 mouse support, signed decimals in knob format --- makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 073f130..f71c6eb 100644 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ out/disk.vdi: out/disk.img out/disk.img: out/kernel.bin out/boot.bin out/fs mkdir -p obj - mkfs.fat -C -f 1 -F 16 -n "PORTLAND OS" -R 65 -s 1 -S 512 obj/shadow.img 8192 + mkfs.fat -C -f 1 -F 16 -n "PORTLAND OS" -R 129 -s 1 -S 512 obj/shadow.img 8192 echo -n -e '\xeb\x3c' > obj/jmp.bin dd if=obj/jmp.bin of=obj/shadow.img obs=2 conv=notrunc dd if=out/boot.bin of=obj/shadow.img obs=1 seek=62 conv=notrunc @@ -38,7 +38,7 @@ out/fs/bin/%: obj/%.elf out/fs: out/fs/bin/init out/fs/bin/highway out/fs/bin/meminfo \ out/fs/bin/terminal out/fs/bin/hello out/fs/bin/mkpopup \ out/fs/bin/dirlist out/fs/bin/ttt out/fs/bin/time \ - out/fs/bin/filetest + out/fs/bin/filetest out/fs/bin/mdemo touch out/fs cp -r fs-skel/* out/fs/ @@ -136,4 +136,8 @@ obj/time.elf: obj/time/time.o obj/libterm.so obj/knob.so \ obj/filetest.elf: obj/filetest/filetest.o obj/libterm.so obj/knob.so \ obj/c.rto + ld -T src/user/runtimes/c/elf.ld $^ -o $@ + +obj/mdemo.elf: obj/mdemo/main.o obj/popups.so obj/libfont.so \ + obj/knob.so obj/c.rto ld -T src/user/runtimes/c/elf.ld $^ -o $@ \ No newline at end of file -- cgit v1.2.3