piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected two faulty font file names in translations.cpp and broken dependencies in Makefile. Standard version now builds again.

Browse Source
This commit is contained in:
kjell.kernen@gmail.com
2013-06-05 21:38:10 +00:00
parent bb3751bb9a
commit e589f91d45
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+2 -21
View File
@@ -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
src/translations.cpp
+2 -2
View File
@@ -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)