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 /tools/convbdf.c | |
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 'tools/convbdf.c')
-rw-r--r-- | tools/convbdf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/convbdf.c b/tools/convbdf.c index c508bbf2e8..58ab2645b4 100644 --- a/tools/convbdf.c +++ b/tools/convbdf.c | |||
@@ -1214,7 +1214,6 @@ int gen_c_source(struct font* pf, char *path) | |||
1214 | "#include <stdbool.h>\n" | 1214 | "#include <stdbool.h>\n" |
1215 | "#include \"config.h\"\n" | 1215 | "#include \"config.h\"\n" |
1216 | "#include \"font.h\"\n" | 1216 | "#include \"font.h\"\n" |
1217 | "#ifdef HAVE_LCD_BITMAP\n" | ||
1218 | "\n" | 1217 | "\n" |
1219 | "/* Font information:\n" | 1218 | "/* Font information:\n" |
1220 | " name: %s\n" | 1219 | " name: %s\n" |
@@ -1426,7 +1425,6 @@ int gen_c_source(struct font* pf, char *path) | |||
1426 | " 0, /* */\n" | 1425 | " 0, /* */\n" |
1427 | " 0, /* */\n" | 1426 | " 0, /* */\n" |
1428 | "};\n" | 1427 | "};\n" |
1429 | "#endif /* HAVE_LCD_BITMAP */\n" | ||
1430 | ); | 1428 | ); |
1431 | 1429 | ||
1432 | return 0; | 1430 | return 0; |
@@ -1440,7 +1438,6 @@ int gen_h_header(struct font* pf, char *path) | |||
1440 | char buf[256]; | 1438 | char buf[256]; |
1441 | char *hdr1 = | 1439 | char *hdr1 = |
1442 | "/* Generated by convbdf on %s. */\n" | 1440 | "/* Generated by convbdf on %s. */\n" |
1443 | "#ifdef HAVE_LCD_BITMAP\n" | ||
1444 | "\n" | 1441 | "\n" |
1445 | "/* Font information */\n" | 1442 | "/* Font information */\n" |
1446 | "#define SYSFONT_NAME %s\n" | 1443 | "#define SYSFONT_NAME %s\n" |
@@ -1458,8 +1455,7 @@ int gen_h_header(struct font* pf, char *path) | |||
1458 | "#define SYSFONT_PROPORTIONAL %d\n" | 1455 | "#define SYSFONT_PROPORTIONAL %d\n" |
1459 | "#define SYSFONT_COPYRIGHT %s\n" | 1456 | "#define SYSFONT_COPYRIGHT %s\n" |
1460 | "#define SYSFONT_BITS_SIZE %d\n" | 1457 | "#define SYSFONT_BITS_SIZE %d\n" |
1461 | "\n" | 1458 | "\n"; |
1462 | "#endif\n"; | ||
1463 | 1459 | ||
1464 | ofp = fopen(path, "w"); | 1460 | ofp = fopen(path, "w"); |
1465 | if (!ofp) { | 1461 | if (!ofp) { |