]> Chaos Git - corbenik/corbenik.git/commitdiff
Update submodules, make bdfe output font directly
authorchaoskagami <chaos.kagami@gmail.com>
Mon, 18 Jul 2016 01:07:38 +0000 (21:07 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Mon, 18 Jul 2016 01:07:38 +0000 (21:07 -0400)
Makefile
external/libctr9
host/bdfe
host/conv-font-bin.sh [deleted file]
host/font-emit.c [deleted file]

index 5e76da99fff795bf1da05073ee70a2e582f059ba..5e31d6d2f079da9d5e34f1bef82ba9f55f1a586b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,9 +79,9 @@ hosttools:
 
 .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
index 715c210cdf06632b87d8b1717e4be907ab6bc19e..b43b58788848e3669f35162651e33763119908c0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 715c210cdf06632b87d8b1717e4be907ab6bc19e
+Subproject commit b43b58788848e3669f35162651e33763119908c0
index e241c5b56674e0b56b46e708602169d4948044a8..fd72cb33447e5529ed73628caf8fb20d0bad0d9a 160000 (submodule)
--- a/host/bdfe
+++ b/host/bdfe
@@ -1 +1 @@
-Subproject commit e241c5b56674e0b56b46e708602169d4948044a8
+Subproject commit fd72cb33447e5529ed73628caf8fb20d0bad0d9a
diff --git a/host/conv-font-bin.sh b/host/conv-font-bin.sh
deleted file mode 100755 (executable)
index c8ec6e5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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
diff --git a/host/font-emit.c b/host/font-emit.c
deleted file mode 100644 (file)
index 8a6a64a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#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;
-}