diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/export/font.h | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'firmware/export/font.h')
-rw-r--r-- | firmware/export/font.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/firmware/export/font.h b/firmware/export/font.h index ad72cb52c7..067c67e43d 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
@@ -30,13 +30,11 @@ | |||
30 | */ | 30 | */ |
31 | #include "config.h" | 31 | #include "config.h" |
32 | 32 | ||
33 | #if defined(HAVE_LCD_BITMAP) || (CONFIG_PLATFORM & PLATFORM_HOSTED) | ||
34 | #ifndef __PCTOOL__ | 33 | #ifndef __PCTOOL__ |
35 | #include "font_cache.h" | 34 | #include "font_cache.h" |
36 | #include "sysfont.h" | 35 | #include "sysfont.h" |
37 | #endif | 36 | #endif |
38 | 37 | ||
39 | |||
40 | /* | 38 | /* |
41 | * Fonts are specified by number, and used for display | 39 | * Fonts are specified by number, and used for display |
42 | * of menu information as well as mp3 filename data. | 40 | * of menu information as well as mp3 filename data. |
@@ -139,11 +137,4 @@ int font_getstringsize(const unsigned char *str, int *w, int *h, int fontnumber) | |||
139 | int font_get_width(struct font* ft, unsigned short ch); | 137 | int font_get_width(struct font* ft, unsigned short ch); |
140 | const unsigned char * font_get_bits(struct font* ft, unsigned short ch); | 138 | const unsigned char * font_get_bits(struct font* ft, unsigned short ch); |
141 | 139 | ||
142 | #else /* HAVE_LCD_BITMAP */ | ||
143 | |||
144 | #define font_init() | ||
145 | #define font_load(x) | ||
146 | |||
147 | #endif | ||
148 | |||
149 | #endif | 140 | #endif |