~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New puzzle! 'Keen', a clone of KenKen.
[sgt/puzzles]
/
icons
/
Makefile
diff --git
a/icons/Makefile
b/icons/Makefile
index
5953a1b
..
edd8f87
100644
(file)
--- a/
icons/Makefile
+++ b/
icons/Makefile
@@
-1,8
+1,8
@@
# Makefile for Puzzles icons.
# Makefile for Puzzles icons.
-PUZZLES = blackbox bridges cube dominosa fifteen f
lip 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 f
illing flip galaxies guess
\
+
inertia keen 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))
BASE = $(patsubst %,%-base.png,$(PUZZLES))
WEB = $(patsubst %,%-web.png,$(PUZZLES))
@@
-55,9
+55,12
@@
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
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
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
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
mines-ibase.png : override CROP=240x240 110x110+130+130
lightup-ibase.png : override CROP=256x256 112x112+144+0
loopy-ibase.png : override CROP=257x257 113x113+0+0
mines-ibase.png : override CROP=240x240 110x110+130+130
@@
-68,7
+71,7
@@
pegs-ibase.png : override CROP=263x263 147x147+116+0
rect-ibase.png : override CROP=205x205 115x115+90+0
sixteen-ibase.png : override CROP=288x288 144x144+144+144
slant-ibase.png : override CROP=321x321 160x160+160+160
rect-ibase.png : override CROP=205x205 115x115+90+0
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
twiddle-ibase.png : override CROP=192x192 102x102+69+21
unequal-ibase.png : override CROP=208x208 104x104+104+104
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
@@
-101,17
+104,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
# 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
$(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
$(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.
# Build the actual Windows icons themselves, by feeding all those
# PNGs to my icon builder script.
@@
-124,7
+127,8
@@
$(ICONS): %.ico: %-48d24.png %-48d8.png %-48d4.png \
# Build the .RC files which bind the icons into the applications.
$(RC): %.rc:
# 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
# Build the GTK icon source files.
$(CICONS): %-icon.c: %-16d24.png %-32d24.png %-48d24.png