diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-08-31 13:31:00 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-08-31 13:32:24 -0400 |
commit | 56b49b3074f4ad9b6774f7be81b35772733b15a0 (patch) | |
tree | ed50ca13d19f8ebd5a32679b05b025fc4dbf9ff2 | |
parent | 790a5bb0ca464c7ed1e0f1b058bb1ac30a8a055c (diff) | |
download | rockbox-56b49b3074f4ad9b6774f7be81b35772733b15a0.tar.gz rockbox-56b49b3074f4ad9b6774f7be81b35772733b15a0.zip |
fonts: Use '08-Rockfont' as FONT_SYSFIXED on targets with 128x64 screens
..It's already the default UI font on those targets
Change-Id: If8cb44da650d19882e4bd4b641af2f4fa59c1cd1
-rw-r--r-- | firmware/firmware.make | 9 | ||||
-rwxr-xr-x | tools/configure | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/firmware/firmware.make b/firmware/firmware.make index 50b58af794..e2babca594 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make | |||
@@ -22,7 +22,10 @@ OTHER_SRC += $(FIRMLIB_SRC) | |||
22 | 22 | ||
23 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a | 23 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a |
24 | 24 | ||
25 | SYSFONT = $(ROOTDIR)/fonts/08-Schumacher-Clean.bdf | 25 | ifeq ($(SYSFONT),) |
26 | SYSFONT = 08-Schumacher-Clean | ||
27 | endif | ||
28 | SYSFONTX = $(ROOTDIR)/fonts/$(SYSFONT).bdf | ||
26 | 29 | ||
27 | CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.* | 30 | CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.* |
28 | 31 | ||
@@ -37,10 +40,10 @@ $(FIRMLIB): $(FIRMLIB_OBJ) | |||
37 | $(SILENT)$(shell rm -f $@) | 40 | $(SILENT)$(shell rm -f $@) |
38 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 41 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
39 | 42 | ||
40 | $(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(BUILDDIR)/firmware/common/config.o | 43 | $(BUILDDIR)/sysfont.h: $(SYSFONTX) $(TOOLS) $(BUILDDIR)/firmware/common/config.o |
41 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $< | 44 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $< |
42 | 45 | ||
43 | $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h | 46 | $(BUILDDIR)/sysfont.o: $(SYSFONTX) $(BUILDDIR)/sysfont.h |
44 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< | 47 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< |
45 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ | 48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ |
46 | 49 | ||
diff --git a/tools/configure b/tools/configure index 79875aca14..7c9e3773c6 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -28,6 +28,7 @@ libdir= | |||
28 | sharedir= | 28 | sharedir= |
29 | 29 | ||
30 | thread_support="ASSEMBLER_THREADS" | 30 | thread_support="ASSEMBLER_THREADS" |
31 | sysfont="08-Schumacher-Clean" | ||
31 | app_lcd_width= | 32 | app_lcd_width= |
32 | app_lcd_height= | 33 | app_lcd_height= |
33 | app_lcd_orientation= | 34 | app_lcd_orientation= |
@@ -1737,6 +1738,7 @@ fi | |||
1737 | t_cpu="arm" | 1738 | t_cpu="arm" |
1738 | t_manufacturer="pnx0101" | 1739 | t_manufacturer="pnx0101" |
1739 | t_model="iriver-ifp7xx" | 1740 | t_model="iriver-ifp7xx" |
1741 | sysfont="08-Rockfont" | ||
1740 | ;; | 1742 | ;; |
1741 | 1743 | ||
1742 | 14|iriverh10) | 1744 | 14|iriverh10) |
@@ -2244,6 +2246,7 @@ fi | |||
2244 | t_cpu="arm" | 2246 | t_cpu="arm" |
2245 | t_manufacturer="tcc77x" | 2247 | t_manufacturer="tcc77x" |
2246 | t_model="logikdax" | 2248 | t_model="logikdax" |
2249 | sysfont="08-Rockfont" | ||
2247 | ;; | 2250 | ;; |
2248 | 2251 | ||
2249 | 89|creativezenxfistyle) | 2252 | 89|creativezenxfistyle) |
@@ -2542,6 +2545,7 @@ fi | |||
2542 | t_cpu="arm" | 2545 | t_cpu="arm" |
2543 | t_manufacturer="tcc77x" | 2546 | t_manufacturer="tcc77x" |
2544 | t_model="m200" | 2547 | t_model="m200" |
2548 | sysfont="08-Rockfont" | ||
2545 | ;; | 2549 | ;; |
2546 | 2550 | ||
2547 | 54|sansac100) | 2551 | 54|sansac100) |
@@ -2565,6 +2569,7 @@ fi | |||
2565 | t_cpu="arm" | 2569 | t_cpu="arm" |
2566 | t_manufacturer="tcc77x" | 2570 | t_manufacturer="tcc77x" |
2567 | t_model="c100" | 2571 | t_model="c100" |
2572 | sysfont="08-Rockfont" | ||
2568 | ;; | 2573 | ;; |
2569 | 2574 | ||
2570 | 55|sansaclip) | 2575 | 55|sansaclip) |
@@ -2583,6 +2588,7 @@ fi | |||
2583 | t_cpu="arm" | 2588 | t_cpu="arm" |
2584 | t_manufacturer="as3525" | 2589 | t_manufacturer="as3525" |
2585 | t_model="sansa-clip" | 2590 | t_model="sansa-clip" |
2591 | sysfont="08-Rockfont" | ||
2586 | if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi | 2592 | if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi |
2587 | arm9tdmicc | 2593 | arm9tdmicc |
2588 | GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'` | 2594 | GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'` |
@@ -2625,6 +2631,7 @@ fi | |||
2625 | t_cpu="arm" | 2631 | t_cpu="arm" |
2626 | t_manufacturer="as3525" | 2632 | t_manufacturer="as3525" |
2627 | t_model="sansa-m200v4" | 2633 | t_model="sansa-m200v4" |
2634 | sysfont="08-Rockfont" | ||
2628 | if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi | 2635 | if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi |
2629 | arm9tdmicc | 2636 | arm9tdmicc |
2630 | GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'` | 2637 | GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'` |
@@ -2691,6 +2698,7 @@ fi | |||
2691 | t_cpu="arm" | 2698 | t_cpu="arm" |
2692 | t_manufacturer="as3525" | 2699 | t_manufacturer="as3525" |
2693 | t_model="sansa-clipv2" | 2700 | t_model="sansa-clipv2" |
2701 | sysfont="08-Rockfont" | ||
2694 | arm926ejscc | 2702 | arm926ejscc |
2695 | ;; | 2703 | ;; |
2696 | 2704 | ||
@@ -2732,6 +2740,7 @@ fi | |||
2732 | t_cpu="arm" | 2740 | t_cpu="arm" |
2733 | t_manufacturer="as3525" | 2741 | t_manufacturer="as3525" |
2734 | t_model="sansa-clipplus" | 2742 | t_model="sansa-clipplus" |
2743 | sysfont="08-Rockfont" | ||
2735 | arm926ejscc | 2744 | arm926ejscc |
2736 | ;; | 2745 | ;; |
2737 | 2746 | ||
@@ -4028,6 +4037,7 @@ fi | |||
4028 | t_cpu="mips" | 4037 | t_cpu="mips" |
4029 | t_manufacturer="ingenic_jz47xx" | 4038 | t_manufacturer="ingenic_jz47xx" |
4030 | t_model="xduoo_x3" | 4039 | t_model="xduoo_x3" |
4040 | sysfont="08-Rockfont" | ||
4031 | ;; | 4041 | ;; |
4032 | 4042 | ||
4033 | 242|xduoox3ii) | 4043 | 242|xduoox3ii) |
@@ -4707,6 +4717,7 @@ export MODELNAME=${modelname} | |||
4707 | export FLASHFILE=${flash} | 4717 | export FLASHFILE=${flash} |
4708 | export TARGET_ID=${target_id} | 4718 | export TARGET_ID=${target_id} |
4709 | export TARGET=-D${target} | 4719 | export TARGET=-D${target} |
4720 | export SYSFONT=${sysfont} | ||
4710 | export ARCH=${arch} | 4721 | export ARCH=${arch} |
4711 | export ARCH_VERSION=${arch_version} | 4722 | export ARCH_VERSION=${arch_version} |
4712 | export CPU=${t_cpu} | 4723 | export CPU=${t_cpu} |