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

diff --git a/icons/Makefile b/icons/Makefile
index 934b792..ce79dc9 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -19,6 +19,8 @@ P16D24 = $(patsubst %,%-16d24.png,$(PUZZLES))
 P16D8 = $(patsubst %,%-16d8.png,$(PUZZLES))
 P16D4 = $(patsubst %,%-16d4.png,$(PUZZLES))
 ICONS = $(patsubst %,%.ico,$(PUZZLES))
+CICONS = $(patsubst %,%-icon.c,$(PUZZLES))
+RC = $(patsubst %,%.rc,$(PUZZLES))
 
 BIN = ../
 PIC = ./
@@ -26,7 +28,9 @@ PIC = ./
 base: $(BASE)
 web: $(WEB)
 pngicons: $(P48D24) $(P32D24) $(P16D24)
-icons: $(ICONS)
+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
@@ -108,12 +112,22 @@ $(P16D4): %-16d4.png: %-ibase.png
 	convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
 	rm -f tmp.png tmp2.png
 
-# And build the actual 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.
 $(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"' > $@
+
+# Build the GTK icon source files.
+$(CICONS): %-icon.c: %-16d24.png %-32d24.png %-48d24.png
+	$(PIC)cicon.pl $^ > $@	
 
 clean:
-	rm -f *.png *.ico
+	rm -f *.png *.ico *.rc *-icon.c