X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/7f7476c217b6a70490ca1e17c5e5b9b51eb263b1..cb0c7d4a682a68dfeb06e1c4e3aeb01cdf126c5e:/icons/Makefile

diff --git a/icons/Makefile b/icons/Makefile
index ce79dc9..3ab0e99 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -1,8 +1,8 @@
 # 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 lightup loopy map mines net netslide pattern pegs rect \
+	  samegame sixteen slant solo tents twiddle unequal untangle
 
 BASE = $(patsubst %,%-base.png,$(PUZZLES))
 WEB = $(patsubst %,%-web.png,$(PUZZLES))
@@ -55,7 +55,9 @@ 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
 lightup-ibase.png : override CROP=256x256 112x112+144+0
@@ -71,6 +73,7 @@ slant-ibase.png : override CROP=321x321 160x160+160+160
 solo-ibase.png : override CROP=321x321 97x97+16+16
 tents-ibase.png : override CROP=320x320 165x165+142+0
 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)
@@ -100,17 +103,17 @@ $(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.
@@ -123,7 +126,8 @@ $(ICONS): %.ico: %-48d24.png %-48d8.png %-48d4.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