Makefile fixes

This commit is contained in:
Bertrand Songis
2015-10-14 23:47:51 +02:00
parent ce2f7b61e9
commit ddaf6237b9
+5 -3
View File
@@ -1186,7 +1186,7 @@ endif
ifeq ($(PCB), HORUS)
# HORUS radio
ARCH = ARM
LCDSIZE = 320
LCDSIZE = 480
GUIDIRECTORY = Horus
FLAVOUR = HORUS
LDSCRIPT = targets/Horus/stm32f4_flash.ld
@@ -1851,6 +1851,7 @@ ifeq ($(PCB), $(filter $(PCB), HORUS))
MIDSIZE = 16
DBLSIZE = 20
XXLSIZE = 38
MASKFORMAT = 8bits
else
FONTNAME = Roboto
TINSIZE = 5
@@ -1859,13 +1860,14 @@ else
MIDSIZE = 11
DBLSIZE = 14
XXLSIZE = 38
MASKFORMAT = 4bits
endif
.PHONY: fonts
fonts: $(FONTS)
fonts/font_%size.lbm: fonts/font_%size.png
$(IMG2LBM) $^ $@ $(LCDSIZE) 8bits
$(IMG2LBM) $^ $@ $(LCDSIZE) $(MASKFORMAT)
fonts/font_tinsize.png:
$(FONT2PNG) $(FONTNAME) $(TINSIZE) fonts/font_tinsize
@@ -1907,7 +1909,7 @@ bitmaps/Flamenco/%.lbm: bitmaps/Flamenco/%.png
$(IMG2LBM) $^ $@ $(LCDSIZE) 4/4/4/4
bitmaps/Horus/mask_%.lbm: bitmaps/Horus/mask_%.png
$(IMG2LBM) $^ $@ $(LCDSIZE) 8bits
$(IMG2LBM) $^ $@ $(LCDSIZE) $(MASKFORMAT)
bitmaps/Horus/%.lbm: bitmaps/Horus/%.png
$(IMG2LBM) $^ $@ $(LCDSIZE) 5/6/5