diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-14 18:02:51 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-14 18:02:51 -0700 |
| commit | b825ea71ebcc4a8da3e339ab3e21b0ad47f2e48f (patch) | |
| tree | 4a09dfffb4103eb1088d1d682e489b961b3129fa /icon | |
| parent | 4ec960b705b87b15d015abb2a9a3e23eee414f1d (diff) | |
icon: Build windows ico files, clean built files
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'icon')
| -rw-r--r-- | icon/Makefile.am | 22 | ||||
| -rwxr-xr-x | icon/make-png | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/icon/Makefile.am b/icon/Makefile.am index db5577d6..b36f6f7b 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -1,15 +1,19 @@ -LINUX_RES=16 32 48 64 128 256 512 MAC_RES=16 32 128 256 512 WIN_RES=16 24 32 48 64 72 96 128 180 256 -RES=$(shell echo $(LINUX_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u) +RES=$(shell echo $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u) AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done) MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done) TG_FILES=$(shell for i in $(RES); do echo telegps-$$i.png; done) + MAC_TG_FILES=$(shell for i in $(MAC_RES); do echo telegps-$$i.png; done) MAC_MP_FILES=$(shell for i in $(MAC_RES); do echo micropeak-$$i.png; done) MAC_AM_FILES=$(shell for i in $(MAC_RES); do echo altus-metrum-$$i.png; done) +WIN_TG_FILES=$(shell for i in $(WIN_RES); do echo telegps-$$i.png; done) +WIN_MP_FILES=$(shell for i in $(WIN_RES); do echo micropeak-$$i.png; done) +WIN_AM_FILES=$(shell for i in $(WIN_RES); do echo altus-metrum-$$i.png; done) + ICO_FILES=altus-metrum.ico micro-peak.ico telegps.ico ICNS_FILES=AltosUIIcon.icns TeleGPS.icns MicroPeak.icns @@ -29,7 +33,7 @@ res: all-local: $(ICO_FILES) $(ICNS_FILES) clean-local: - $(RM) $(TG_FILES) $(MP_FILES) $(ICO_FILES) $(ICNS_FILES) *.build + $(RM) altus-metrum-*.png telegps-*.png micropeak-*.png *.build *.ico *.icns $(AM_FILES): altusmetrum.build @@ -49,14 +53,14 @@ micropeak.build: micropeak.svg #clean-local: # $(RM) -f $(ICO_FILES) -altus-metrum.ico: $(AM_FILES) - icotool -c -o $@ $(AM_FILES) +altus-metrum.ico: $(WIN_AM_FILES) + icotool -c -o $@ $(WIN_AM_FILES) -micro-peak.ico: $(MP_FILES) - icotool -c -o $@ $(MP_FILES) +micro-peak.ico: $(WIN_MP_FILES) + icotool -c -o $@ $(WIN_MP_FILES) -telegps.ico: $(TG_FILES) - icotool -c -o $@ $(TG_FILES) +telegps.ico: $(WIN_TG_FILES) + icotool -c -o $@ $(WIN_TG_FILES) AltosUIIcon.icns: $(MAC_AM_FILES) png2icns $@ $(MAC_AM_FILES) diff --git a/icon/make-png b/icon/make-png index 748cf32e..bc865d9f 100755 --- a/icon/make-png +++ b/icon/make-png @@ -20,8 +20,6 @@ OPACITY=80 BLUR=$(($SHADOW / 4)) SHIFT=$(($SHADOW - $BLUR)) -echo SHADOW $SHADOW IMAGE $IMAGE OPACITY $OPACITY SHIFT $SHIFT BLUR $BLUR - TMP=image-$$.png trap "rm $TMP" 0 1 15 |