mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 02:27:39 -04:00
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
This commit is contained in:
parent
790a5bb0ca
commit
56b49b3074
2 changed files with 17 additions and 3 deletions
|
@ -22,7 +22,10 @@ OTHER_SRC += $(FIRMLIB_SRC)
|
||||||
|
|
||||||
FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a
|
FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a
|
||||||
|
|
||||||
SYSFONT = $(ROOTDIR)/fonts/08-Schumacher-Clean.bdf
|
ifeq ($(SYSFONT),)
|
||||||
|
SYSFONT = 08-Schumacher-Clean
|
||||||
|
endif
|
||||||
|
SYSFONTX = $(ROOTDIR)/fonts/$(SYSFONT).bdf
|
||||||
|
|
||||||
CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.*
|
CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.*
|
||||||
|
|
||||||
|
@ -37,10 +40,10 @@ $(FIRMLIB): $(FIRMLIB_OBJ)
|
||||||
$(SILENT)$(shell rm -f $@)
|
$(SILENT)$(shell rm -f $@)
|
||||||
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
|
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
|
||||||
|
|
||||||
$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(BUILDDIR)/firmware/common/config.o
|
$(BUILDDIR)/sysfont.h: $(SYSFONTX) $(TOOLS) $(BUILDDIR)/firmware/common/config.o
|
||||||
$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $<
|
$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $<
|
||||||
|
|
||||||
$(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h
|
$(BUILDDIR)/sysfont.o: $(SYSFONTX) $(BUILDDIR)/sysfont.h
|
||||||
$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $<
|
$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $<
|
||||||
$(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@
|
$(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@
|
||||||
|
|
||||||
|
|
11
tools/configure
vendored
11
tools/configure
vendored
|
@ -28,6 +28,7 @@ libdir=
|
||||||
sharedir=
|
sharedir=
|
||||||
|
|
||||||
thread_support="ASSEMBLER_THREADS"
|
thread_support="ASSEMBLER_THREADS"
|
||||||
|
sysfont="08-Schumacher-Clean"
|
||||||
app_lcd_width=
|
app_lcd_width=
|
||||||
app_lcd_height=
|
app_lcd_height=
|
||||||
app_lcd_orientation=
|
app_lcd_orientation=
|
||||||
|
@ -1737,6 +1738,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="pnx0101"
|
t_manufacturer="pnx0101"
|
||||||
t_model="iriver-ifp7xx"
|
t_model="iriver-ifp7xx"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
14|iriverh10)
|
14|iriverh10)
|
||||||
|
@ -2244,6 +2246,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="tcc77x"
|
t_manufacturer="tcc77x"
|
||||||
t_model="logikdax"
|
t_model="logikdax"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
89|creativezenxfistyle)
|
89|creativezenxfistyle)
|
||||||
|
@ -2542,6 +2545,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="tcc77x"
|
t_manufacturer="tcc77x"
|
||||||
t_model="m200"
|
t_model="m200"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
54|sansac100)
|
54|sansac100)
|
||||||
|
@ -2565,6 +2569,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="tcc77x"
|
t_manufacturer="tcc77x"
|
||||||
t_model="c100"
|
t_model="c100"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
55|sansaclip)
|
55|sansaclip)
|
||||||
|
@ -2583,6 +2588,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="as3525"
|
t_manufacturer="as3525"
|
||||||
t_model="sansa-clip"
|
t_model="sansa-clip"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
|
if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
|
||||||
arm9tdmicc
|
arm9tdmicc
|
||||||
GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
|
GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
|
||||||
|
@ -2625,6 +2631,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="as3525"
|
t_manufacturer="as3525"
|
||||||
t_model="sansa-m200v4"
|
t_model="sansa-m200v4"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
|
if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
|
||||||
arm9tdmicc
|
arm9tdmicc
|
||||||
GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
|
GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
|
||||||
|
@ -2691,6 +2698,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="as3525"
|
t_manufacturer="as3525"
|
||||||
t_model="sansa-clipv2"
|
t_model="sansa-clipv2"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
arm926ejscc
|
arm926ejscc
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -2732,6 +2740,7 @@ fi
|
||||||
t_cpu="arm"
|
t_cpu="arm"
|
||||||
t_manufacturer="as3525"
|
t_manufacturer="as3525"
|
||||||
t_model="sansa-clipplus"
|
t_model="sansa-clipplus"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
arm926ejscc
|
arm926ejscc
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -4028,6 +4037,7 @@ fi
|
||||||
t_cpu="mips"
|
t_cpu="mips"
|
||||||
t_manufacturer="ingenic_jz47xx"
|
t_manufacturer="ingenic_jz47xx"
|
||||||
t_model="xduoo_x3"
|
t_model="xduoo_x3"
|
||||||
|
sysfont="08-Rockfont"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
242|xduoox3ii)
|
242|xduoox3ii)
|
||||||
|
@ -4707,6 +4717,7 @@ export MODELNAME=${modelname}
|
||||||
export FLASHFILE=${flash}
|
export FLASHFILE=${flash}
|
||||||
export TARGET_ID=${target_id}
|
export TARGET_ID=${target_id}
|
||||||
export TARGET=-D${target}
|
export TARGET=-D${target}
|
||||||
|
export SYSFONT=${sysfont}
|
||||||
export ARCH=${arch}
|
export ARCH=${arch}
|
||||||
export ARCH_VERSION=${arch_version}
|
export ARCH_VERSION=${arch_version}
|
||||||
export CPU=${t_cpu}
|
export CPU=${t_cpu}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue