From e589f91d45c33f8a4392a3de70cb7aa9641d494b Mon Sep 17 00:00:00 2001 From: "kjell.kernen@gmail.com" Date: Wed, 5 Jun 2013 21:38:10 +0000 Subject: [PATCH] Corrected two faulty font file names in translations.cpp and broken dependencies in Makefile. Standard version now builds again. --- src/Makefile | 23 ++--------------------- src/translations.cpp | 4 ++-- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/Makefile b/src/Makefile index a65274dfa..42d8aa01d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1030,7 +1030,7 @@ else build: stamp_header lbm allsrc.cpp elf remallsrc bin lss endif -lbm: bitmaps/font.lbm bitmaps/sticks.lbm +lbm: bitmaps/font_05x07.lbm bitmaps/sticks.lbm elf: $(TARGET).elf bin: $(TARGET).bin @@ -1085,26 +1085,7 @@ taranis-stamp: @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-taranis.txt @cat stamp-opentx-taranis.txt -bitmaps/font_05x07.lbm: -bitmaps/font_03x05.xbm -bitmaps/font_04x06.xbm -bitmaps/font_05x07.xbm -bitmaps/font_08x10.xbm -bitmaps/font_10x14.xbm -bitmaps/font_04x06_extra.xbm -bitmaps/font_05x07_extra.xbm -bitmaps/font_10x14_extra.xbm -translations/font_se_05x07.xbm -translations/font_de_05x07.xbm -translations/font_it_05x07.xbm -translations/font_cz_05x07.xbm -translations/font_fr_05x07.xbm -translations/font_es_05x07.xbm -translations/font_se_10x14.xbm -translations/font_de_10x14.xbm -translations/font_it_10x14.xbm -translations/font_fr_10x14.xbm -translations/font_es_10x14.xbm +bitmaps/font_05x07.lbm: bitmaps/font_03x05.xbm bitmaps/font_04x06.xbm bitmaps/font_05x07.xbm bitmaps/font_08x10.xbm bitmaps/font_10x14.xbm bitmaps/font_04x06_extra.xbm bitmaps/font_05x07_extra.xbm bitmaps/font_10x14_extra.xbm translations/font_se_05x07.xbm translations/font_de_05x07.xbm translations/font_it_05x07.xbm translations/font_cz_05x07.xbm translations/font_fr_05x07.xbm translations/font_es_05x07.xbm translations/font_se_10x14.xbm translations/font_de_10x14.xbm translations/font_it_10x14.xbm translations/font_fr_10x14.xbm translations/font_es_10x14.xbm @echo @echo "Convert fonts from xbm to lbm:" $(IMG2LBM) bitmaps/font_03x05.xbm bitmaps/font_03x05.lbm 3x5 diff --git a/src/translations.cpp b/src/translations.cpp index 8cb9b6fec..b9881c2cf 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -499,7 +499,7 @@ const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR; #endif const pm_uchar font_5x7[] PROGMEM = { -#include "bitmaps/font.lbm" +#include "bitmaps/font_05x07.lbm" #if defined(TRANSLATIONS_DE) #include "translations/font_de_05x07.lbm" #elif defined(TRANSLATIONS_CZ) @@ -518,7 +518,7 @@ const pm_uchar font_5x7[] PROGMEM = { }; const pm_uchar font_10x14[] PROGMEM = { -#include "bitmaps/font_dblsize.lbm" +#include "bitmaps/font_10x14.lbm" #if defined(TRANSLATIONS_DE) #include "translations/font_de_10x14.lbm" #elif defined(TRANSLATIONS_CZ)