From 4f2e8c5cd3ae27d50c0f558485ab3bbb9bba9a84 Mon Sep 17 00:00:00 2001 From: Xnoe Date: Sun, 29 Aug 2021 11:26:38 +0100 Subject: [PATCH] Updated Makefile and .gitignore to allow for many other binaries to be added --- .gitignore | 1 + Makefile | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 045c54d..ce571f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.bin *.img +*.sector img.d/ \ No newline at end of file diff --git a/Makefile b/Makefile index 1b481dc..5adfe4f 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,16 @@ -disk.img: boot.bin kernel.bin +disk.img: boot.sector kernel.bin hello.bin dd if=/dev/zero of=disk.img count=43 bs=100k - dd if=boot.bin of=disk.img conv=notrunc + dd if=boot.sector of=disk.img conv=notrunc mount disk.img img.d - cp kernel.bin img.d + cp *.bin img.d/ umount img.d chmod 777 disk.img -boot.bin: boot.asm +boot.sector: boot.asm nasm boot.asm -o $@ kernel.bin: kernel.asm nasm kernel.asm -o $@ + +hello.bin: hello.asm + nasm hello.asm -o $@ \ No newline at end of file