From 1e9574da3ee49dc41cb9bc747342ba276bc7e873 Mon Sep 17 00:00:00 2001
From: chaoskagami <chaos.kagami@gmail.com>
Date: Sun, 17 Jul 2016 21:07:38 -0400
Subject: [PATCH] Update submodules, make bdfe output font directly

---
 Makefile              |  4 ++--
 external/libctr9      |  2 +-
 host/bdfe             |  2 +-
 host/conv-font-bin.sh | 15 ---------------
 host/font-emit.c      | 17 -----------------
 5 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100755 host/conv-font-bin.sh
 delete mode 100644 host/font-emit.c

diff --git a/Makefile b/Makefile
index 5e76da9..5e31d6d 100644
--- 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
diff --git a/external/libctr9 b/external/libctr9
index 715c210..b43b587 160000
--- a/external/libctr9
+++ b/external/libctr9
@@ -1 +1 @@
-Subproject commit 715c210cdf06632b87d8b1717e4be907ab6bc19e
+Subproject commit b43b58788848e3669f35162651e33763119908c0
diff --git a/host/bdfe b/host/bdfe
index e241c5b..fd72cb3 160000
--- 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
index c8ec6e5..0000000
--- a/host/conv-font-bin.sh
+++ /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
index 8a6a64a..0000000
--- a/host/font-emit.c
+++ /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;
-}
-- 
2.39.5