X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/f12cdd7284a3d144b17c25e271d1edf701692ece..829c02d6b29fa038e9b90b0c438ce8afe3282036:/icons/Makefile

diff --git a/icons/Makefile b/icons/Makefile
index bec2a4a..9901de5 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -1,8 +1,9 @@
 # Makefile for Puzzles icons.
 
-PUZZLES = blackbox bridges cube dominosa fifteen flip guess inertia lightup \
-          loopy map mines net netslide pattern pegs rect samegame sixteen \
-          slant solo tents twiddle untangle
+PUZZLES = blackbox bridges cube dominosa fifteen filling flip galaxies guess \
+	  inertia keen lightup loopy magnets map mines net netslide pattern \
+	  pearl pegs range rect samegame signpost singles sixteen slant solo \
+	  tents towers twiddle unequal untangle
 
 BASE = $(patsubst %,%-base.png,$(PUZZLES))
 WEB = $(patsubst %,%-web.png,$(PUZZLES))
@@ -30,6 +31,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
@@ -54,22 +56,32 @@ blackbox-ibase.png : override CROP=352x352 144x144+0+208
 bridges-ibase.png : override CROP=264x264 107x107+157+157
 dominosa-ibase.png : override CROP=304x272 152x152+152+0
 fifteen-ibase.png : override CROP=240x240 120x120+0+120
+filling-ibase.png : override CROP=256x256 133x133+14+78
 flip-ibase.png : override CROP=288x288 145x145+120+72
+galaxies-ibase.png : override CROP=288x288 165x165+0+0
 guess-ibase.png : override CROP=263x420 178x178+75+17
 inertia-ibase.png : override CROP=321x321 128x128+193+0
+keen-ibase.png : override CROP=288x288 96x96+24+120
 lightup-ibase.png : override CROP=256x256 112x112+144+0
 loopy-ibase.png : override CROP=257x257 113x113+0+0
+magnets-ibase.png : override CROP=264x232 96x96+36+100
 mines-ibase.png : override CROP=240x240 110x110+130+130
 net-ibase.png : override CROP=193x193 113x113+0+80
 netslide-ibase.png : override CROP=289x289 144x144+0+0
 pattern-ibase.png : override CROP=384x384 223x223+0+0
+pearl-ibase.png : override CROP=216x216 94x94+108+15
 pegs-ibase.png : override CROP=263x263 147x147+116+0
+range-ibase.png : override CROP=256x256 98x98+111+15
 rect-ibase.png : override CROP=205x205 115x115+90+0
+signpost-ibase.png : override CROP=240x240 98x98+23+23
+singles-ibase.png : override CROP=224x224 98x98+15+15
 sixteen-ibase.png : override CROP=288x288 144x144+144+144
 slant-ibase.png : override CROP=321x321 160x160+160+160
-solo-ibase.png : override CROP=321x321 97x97+16+16
+solo-ibase.png : override CROP=481x481 145x145+24+24
 tents-ibase.png : override CROP=320x320 165x165+142+0
+towers-ibase.png : override CROP=300x300 102x102+151+6
 twiddle-ibase.png : override CROP=192x192 102x102+69+21
+unequal-ibase.png : override CROP=208x208 104x104+104+104
 untangle-ibase.png : override CROP=320x320 164x164+3+116
 $(IBASE): %-ibase.png: %-base.png
 	$(PIC)crop.sh $^ $@ $(CROP)
@@ -99,28 +111,31 @@ $(P48D8) $(P32D8) $(P16D8): %d8.png: %d24.png
 # that on most modern Windows machines this won't matter too
 # much...)
 $(P48D4): %-48d4.png: %-ibase4.png
-	$(PIC)square.pl 48 1 $^ tmp2.png
-	convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
-	rm -f tmp.png tmp2.png
+	$(PIC)square.pl 48 1 $^ $@-tmp2.png
+	convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+	rm -f $@-tmp2.png
 $(P32D4): %-32d4.png: %-ibase.png
-	$(PIC)square.pl 32 1 $^ tmp2.png
-	convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
-	rm -f tmp.png tmp2.png
+	$(PIC)square.pl 32 1 $^ $@-tmp2.png
+	convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+	rm -f $@-tmp2.png
 $(P16D4): %-16d4.png: %-ibase.png
-	$(PIC)square.pl 16 1 $^ tmp2.png
-	convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
-	rm -f tmp.png tmp2.png
+	$(PIC)square.pl 16 1 $^ $@-tmp2.png
+	convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+	rm -f $@-tmp2.png
 
 # Build the actual Windows icons themselves, by feeding all those
 # PNGs to my icon builder script.
 $(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:
-	echo '200 ICON "$*.ico"' > $@
+	echo '#include "puzzles.rc2"' > $@
+	echo '200 ICON "$*.ico"' >> $@
 
 # Build the GTK icon source files.
 $(CICONS): %-icon.c: %-16d24.png %-32d24.png %-48d24.png