Fix completion checking in Killer Solo.

[sgt-puzzles.git] / icons / Makefile

diff --git a/icons/Makefile b/icons/Makefile
index 78abb3526f32fe4b7614405dae726f093bb6b2c0..00dae1f84104bcd5dc6928169206af69510dde55 100644 (file)
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -1,8 +1,10 @@
 # Makefile for Puzzles icons.
 
-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
+PUZZLES = blackbox bridges cube dominosa fifteen filling flip flood    \
+         galaxies guess inertia keen lightup loopy magnets map mines   \
+         net netslide palisade pattern pearl pegs range rect           \
+         samegame signpost singles sixteen slant solo tents towers     \
+         twiddle tracks undead unequal unruly untangle
 
 BASE = $(patsubst %,%-base.png,$(PUZZLES))
 WEB = $(patsubst %,%-web.png,$(PUZZLES))
@@ -25,6 +27,10 @@ RC = $(patsubst %,%.rc,$(PUZZLES))
 BIN = ../
 PIC = ./
 
+# Work around newer ImageMagick unilaterally distorting colours when
+# converting to PNG.
+CSP = -set colorspace RGB
+
 base: $(BASE)
 web: $(WEB)
 pngicons: $(P48D24) $(P32D24) $(P16D24)
@@ -60,19 +66,29 @@ 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
+palisade-ibase.png : override CROP=288x288 192x192+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
+tracks-ibase.png : override CROP=246x246 118x118+6+6
 twiddle-ibase.png : override CROP=192x192 102x102+69+21
+undead-ibase.png : override CROP=416x480 192x192+16+80
 unequal-ibase.png : override CROP=208x208 104x104+104+104
 untangle-ibase.png : override CROP=320x320 164x164+3+116
 $(IBASE): %-ibase.png: %-base.png
@@ -82,7 +98,7 @@ $(IBASE): %-ibase.png: %-base.png
 # seems to work better than reducing it in 24 bits and then
 # dithering.
 $(IBASE4): %-ibase4.png: %-ibase.png
-       convert -colors 16 +dither -map $(PIC)win16pal.xpm $^ $@
+       convert -colors 16 +dither $(CSP) -map $(PIC)win16pal.xpm $^ $@
 
 # Build the 24-bit PNGs for the icons, at three sizes.
 $(P48D24): %-48d24.png: %-ibase.png
@@ -104,15 +120,15 @@ $(P48D8) $(P32D8) $(P16D8): %d8.png: %d24.png
 # much...)
 $(P48D4): %-48d4.png: %-ibase4.png
        $(PIC)square.pl 48 1 $^ $@-tmp2.png
-       convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+       convert -colors 16 $(CSP) -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 $@
+       convert -colors 16 $(CSP) -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 $@
+       convert -colors 16 $(CSP) -map $(PIC)win16pal.xpm $@-tmp2.png $@
        rm -f $@-tmp2.png
 
 # Build the actual Windows icons themselves, by feeding all those
@@ -126,7 +142,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