projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Work without GPS available
[fw/altos]
/
icon
/
Makefile.am
diff --git
a/icon/Makefile.am
b/icon/Makefile.am
index af238ac42527da025ff403481c046ba58146b0b7..0f4389d0b5d5c08cdf6b18fdf6e5c1203ceb8e3b 100644
(file)
--- a/
icon/Makefile.am
+++ b/
icon/Makefile.am
@@
-1,7
+1,8
@@
JAVA_RES=16 32 48 64 128 256
MAC_RES=16 32 128 256 512
WIN_RES=16 24 32 48 64 72 96 128 180 256
JAVA_RES=16 32 48 64 128 256
MAC_RES=16 32 128 256 512
WIN_RES=16 24 32 48 64 72 96 128 180 256
-RES=$(shell echo $(JAVA_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
+AMAZON_RES=114 512
+RES=$(shell echo $(JAVA_RES) $(MAC_RES) $(WIN_RES) $(AMAZON_RES)| awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u)
# Application icon base names
# Application icon base names
@@
-27,6
+28,17
@@
EEPROM_ICON = $(EEPROM_NAME).svg
TELEM_ICON = $(TELEM_NAME).svg
MPD_ICON = $(MPD_NAME).svg
TELEM_ICON = $(TELEM_NAME).svg
MPD_ICON = $(MPD_NAME).svg
+LED_SVG = \
+ redoff.svg \
+ greenoff.svg \
+ greenled.svg \
+ grayon.svg \
+ grayled.svg \
+ redled.svg
+LED_PNG = $(LED_SVG:.svg=.png)
+
+LED_ICONS = $(LED_SVG) $(LED_PNG)
+
# Files needed for Mac OSX icons
MAC_AM_FILES = $(shell for i in $(MAC_RES); do echo $(AM_NAME)-$$i.png; done)
# Files needed for Mac OSX icons
MAC_AM_FILES = $(shell for i in $(MAC_RES); do echo $(AM_NAME)-$$i.png; done)
@@
-62,6
+74,10
@@
JAVA_TG_FILES = $(shell for i in $(JAVA_RES); do echo $(TG_NAME)-$$i.png; done)
JAVA_FILES = $(JAVA_AM_FILES) $(JAVA_MP_FILES) $(JAVA_TG_FILES)
JAVA_FILES = $(JAVA_AM_FILES) $(JAVA_MP_FILES) $(JAVA_TG_FILES)
+# Files needed for Amazon store
+
+AMAZON_FILES = $(shell for i in $(AMAZON_RES); do echo $(AM_NAME)-$$i.png; done)
+
# PNG files needed by anyone
AM_FILES = $(shell for i in $(RES); do echo $(AM_NAME)-$$i.png; done)
# PNG files needed by anyone
AM_FILES = $(shell for i in $(RES); do echo $(AM_NAME)-$$i.png; done)
@@
-109,7
+125,7
@@
java-telegps:
fat: all $(ICO_FILES) $(ICNS_FILES) $(EXE_FILES)
fat: all $(ICO_FILES) $(ICNS_FILES) $(EXE_FILES)
-all-local: $(JAVA_FILES) $(AM_XPM)
+all-local: $(JAVA_FILES) $(AM_XPM)
$(LED_ICONS) $(AMAZON_FILES)
clean-local:
$(RM) $(AM_NAME)-*.png $(TG_NAME)-*.png $(MP_NAME)-*.png
clean-local:
$(RM) $(AM_NAME)-*.png $(TG_NAME)-*.png $(MP_NAME)-*.png
@@
-117,6
+133,7
@@
clean-local:
$(RM) $(EEPROM_NAME)-*.png $(TELEM_NAME)-*.png $(MPD_NAME)-*.png
$(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)
$(RM) altusmetrum.xpm
$(RM) $(EEPROM_NAME)-*.png $(TELEM_NAME)-*.png $(MPD_NAME)-*.png
$(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)
$(RM) altusmetrum.xpm
+ $(RM) $(LED_ICONS)
if INSTALL_SHARED_MIME_INFO
install-data-hook:
if INSTALL_SHARED_MIME_INFO
install-data-hook:
@@
-124,6
+141,9
@@
install-data-hook:
update-icon-caches $(DESTDIR)$(ICON_THEME)
endif
update-icon-caches $(DESTDIR)$(ICON_THEME)
endif
+$(LED_ICONS): led.5c
+ nickle led.5c $@
+
$(MPD_ICON): $(MP_ICON)
$(LN_S) $(MP_ICON) $@
$(MPD_ICON): $(MP_ICON)
$(LN_S) $(MP_ICON) $@
@@
-168,3
+188,6
@@
$(EXE_FILES): windows-stub.o make-rc
windows-stub.o: windows-stub.c
$(MINGCC32) -c $(MINGFLAGS) windows-stub.c
windows-stub.o: windows-stub.c
$(MINGCC32) -c $(MINGFLAGS) windows-stub.c
+
+altosdroid.png: altosdroid.svg
+ rsvg-convert -a -b white -h 480 altosdroid.svg | pngtopnm | pnmpad -white -width 512 -height 512 | pnmtopng > $@