From 4ada94d4db995ebf150dd3ecfc8efd3241a6ff84 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 28 Nov 2019 21:26:22 +0100 Subject: Made font external module --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 11534d0..7df77b6 100644 --- a/Makefile +++ b/Makefile @@ -29,12 +29,18 @@ build: clean rm ./build/tmp; \ i686-elf-gcc -T ./src/kernel/linker.ld -I ./src -o ./build/melvix.bin -std=gnu99 -ffreestanding -O2 -nostdlib ./build/*.o || exit; \ + # Modules + i686-elf-gcc -c ./src/assets/font.c -o ./build/font.o -I ./src -std=gnu99 -ffreestanding -O2 -nostdlib; \ + objcopy -O binary ./build/font.o ./build/font.bin; \ + rm ./build/font.o; \ + # Create ISO mkdir -p ./iso/boot/; \ mv ./build/melvix.bin ./iso/boot/kernel.bin; \ nasm ./src/bootloader/cd.asm -f bin -o ./iso/boot/cd.bin || exit; \ nasm ./src/bootloader/hdd1.asm -f bin -o ./iso/boot/hdd1.bin || exit; \ nasm ./src/bootloader/hdd2.asm -f bin -o ./iso/boot/hdd2.bin || exit; \ + cp ./build/font.bin ./iso/font.bin || exit; \ genisoimage -quiet -input-charset utf-8 -no-emul-boot -b boot/cd.bin -o ./build/melvix.iso ./iso; cross: -- cgit v1.2.3