diff options
| author | Marvin Borner | 2019-11-30 13:22:16 +0100 |
|---|---|---|
| committer | GitHub | 2019-11-30 13:22:16 +0100 |
| commit | 728d764f314b98adec26d8e674b7235db6c4ad63 (patch) | |
| tree | ddbe09554a056eba4a470041c9e3d74ddd64ff8a /Makefile | |
| parent | e294302ec8940669e7c8c5559eff2441f9ce4988 (diff) | |
| parent | de2f84f733776b19c0adecbfc8b31ea88f7b6291 (diff) | |
Merged external font
External font resources (smaller kernel)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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: |