.PHONY: font
font: hosttools
- ./host/conv-font-bin.sh
+ make -C host/bdfe
mkdir -p $(dir_out)/$(fw_folder)/bits
- cp host/termfont.bin $(dir_out)/$(fw_folder)/bits/
+ ./host/bdfe/bdfe -A -n external/tewi-font/tewi-medium-11.bdf > $(dir_out)/$(fw_folder)/bits/termfont.bin
.PHONY: full
full: all contrib $(dir_out)/$(fw_folder)/locale
-Subproject commit 715c210cdf06632b87d8b1717e4be907ab6bc19e
+Subproject commit b43b58788848e3669f35162651e33763119908c0
-Subproject commit e241c5b56674e0b56b46e708602169d4948044a8
+Subproject commit fd72cb33447e5529ed73628caf8fb20d0bad0d9a
+++ /dev/null
-#!/bin/bash
-
-if [ "${CC}" == "" ]; then
- CC=gcc
-fi
-
-set -e
-
-./host/bdfe/bdfe -n -L -v -A external/tewi-font/tewi-medium-11.bdf > host/font.h
-grep "// Converted Font Size" host/font.h | sed -e 's|.* ||g' \
- -e 's|^|const int font_width = |g' \
- -e 's|x|;\nconst int font_height = |g' \
- -e 's|$|;|g' > host/font_prop.h
-${CC} ${CFLAGS} -o host/font-emit host/font-emit.c
-./host/font-emit
+++ /dev/null
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static const unsigned char font_data[] = {
-#include "font.h"
-};
-#include "font_prop.h"
-
-int main() {
- FILE* f = fopen("host/termfont.bin", "wb");
- fwrite(&font_width, 1, 4, f);
- fwrite(&font_height, 1, 4, f);
- fwrite(font_data, 1, sizeof(font_data), f);
- fclose(f);
- return 0;
-}