diff options
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 23 |
1 files changed, 14 insertions, 9 deletions
@@ -22,7 +22,7 @@ clean: rm -r obj out || true qemu: out/disk.img - qemu-system-i386 -m 512 -s -S out/disk.img + gdb -x qemu.gdb bochs: out/disk.img bochs -q @@ -37,7 +37,8 @@ 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/dirlist out/fs/bin/ttt out/fs/bin/time \ + out/fs/bin/filetest touch out/fs cp -r fs-skel/* out/fs/ @@ -49,13 +50,13 @@ obj/kernel/%.kao: src/kernel/%.asm mkdir -p $(shell dirname $@) nasm ${nasmargs} $< -o $@ -out/kernel.bin: obj/kernel/drive.ko obj/kernel/fat.ko obj/kernel/ide.ko \ - obj/kernel/idt.ko obj/kernel/log.ko obj/kernel/main.ko \ - obj/kernel/panic.ko obj/kernel/pci.ko obj/kernel/elf.ko \ - obj/kernel/serial.ko obj/kernel/task.ko obj/kernel/util.ko \ - obj/kernel/window.ko obj/kernel/isrs.kao obj/kernel/kbd.ko \ - obj/kernel/pmap.ko obj/kernel/paging.ko obj/kernel/dump.ko \ - obj/kernel/cmos.ko obj/kernel/settings.ko +out/kernel.bin: obj/kernel/drive.ko obj/kernel/fat.ko obj/kernel/ide.ko \ + obj/kernel/idt.ko obj/kernel/log.ko obj/kernel/main.ko \ + obj/kernel/panic.ko obj/kernel/pci.ko obj/kernel/elf.ko \ + obj/kernel/serial.ko obj/kernel/task.ko obj/kernel/util.ko \ + obj/kernel/window.ko obj/kernel/isrs.kao obj/kernel/kbd.ko \ + obj/kernel/pmap.ko obj/kernel/paging.ko obj/kernel/dump.ko \ + obj/kernel/cmos.ko obj/kernel/settings.ko obj/kernel/shutdown.ko mkdir -p out ld -T src/kernel/elf-link.ld $^ -o obj/kernel.elf objcopy -O binary obj/kernel.elf out/kernel.bin @@ -131,4 +132,8 @@ obj/ttt.elf : obj/ttt/main.o obj/popups.so obj/libfont.so \ obj/time.elf: obj/time/time.o obj/libterm.so obj/knob.so \ obj/c.rto + ld -T src/user/runtimes/c/elf.ld $^ -o $@ + +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 $@
\ No newline at end of file |