Enhance icon.pl to be a fully general Windows icon builder: it now

[sgt/puzzles] / icons / Makefile

diff --git a/icons/Makefile b/icons/Makefile
index bec2a4a..ce79dc9 100644 (file)
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -30,6 +30,7 @@ web: $(WEB)
 pngicons: $(P48D24) $(P32D24) $(P16D24)
 winicons: $(ICONS) $(RC)
 gtkicons: $(CICONS)
+all: base web pngicons winicons gtkicons
 
 # Build the base puzzle screenshots from which all the other images
 # are derived. Some of them involve showing a move animation
@@ -116,7 +117,9 @@ $(P16D4): %-16d4.png: %-ibase.png
 $(ICONS): %.ico: %-48d24.png %-48d8.png %-48d4.png \
                  %-32d24.png %-32d8.png %-32d4.png \
                  %-16d24.png %-16d8.png %-16d4.png
-       $(PIC)icon.pl $? > $@
+       $(PIC)icon.pl -24 $*-48d24.png $*-32d24.png $*-16d24.png \
+                     -8  $*-48d8.png  $*-32d8.png  $*-16d8.png  \
+                     -4  $*-48d4.png  $*-32d4.png  $*-16d4.png  > $@
 
 # Build the .RC files which bind the icons into the applications.
 $(RC): %.rc: