X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=306e115e42bc73a1223dd8e1ef70ed65cd4a9789;hb=cfc68512bf002c16d4a0f2c0acff764f96a2af3e;hp=2a777426c5a6fbed714511a9cff28594f04b2090;hpb=2ee6c61278915427fb637e917cf0fdc94462e992;p=pspp

diff --git a/Smake b/Smake
index 2a777426c5..306e115e42 100644
--- a/Smake
+++ b/Smake
@@ -152,7 +152,13 @@ src/ui/gui/icons/categories/16x16/variable-ordinal.png \
 src/ui/gui/icons/categories/16x16/align-right.png \
 src/ui/gui/icons/categories/16x16/variable-date-nominal.png \
 src/ui/gui/icons/categories/16x16/variable-date-ordinal.png \
-src/ui/gui/icons/categories/16x16/variable-string-scale.png
+src/ui/gui/icons/categories/16x16/variable-string-scale.png \
+src/ui/gui/icons/categories/16x16/variable-role-partition.png \
+src/ui/gui/icons/categories/16x16/variable-role-target.png \
+src/ui/gui/icons/categories/16x16/variable-role-split.png \
+src/ui/gui/icons/categories/16x16/variable-role-input.png \
+src/ui/gui/icons/categories/16x16/variable-role-none.png \
+src/ui/gui/icons/categories/16x16/variable-role-both.png
 
 MIMETYPE_ICONS = \
 src/ui/gui/icons/mimetypes/32x32/application-x-spss-por.png \
@@ -174,7 +180,8 @@ src/ui/gui/icons/mimetypes/48x48/application-x-spss-por.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \
 
-MISC_ICONS = src/ui/gui/icons/splash.png
+MISC_ICONS = src/ui/gui/icons/splash.png \
+src/ui/gui/icons/about-logo.png
 
 
 
@@ -414,7 +421,17 @@ clean:
 
 .PHONY: all gettextize clean
 
+
+# The "convert" program from imagemagick can be used to create png from svg but doesn't properly deal
+# with the alpha channels.  Therefore, it is not recommended for production pspp builds, but might
+# be useful to get something working on a platform which doesn't have a working gimp.
+
+#svg2png=convert $1 $3
+
+svg2png=gimp -i -b '(let* ((image  (car  (gimp-file-load 1  "$1"  "$1"))))  (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $2)"))  (gimp-file-save 1 image (car  (gimp-image-get-active-drawable image)) "$3" "$3")) (gimp-quit 1)'
+
+
 src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	gimp -i -b '(let* ((image  (car  (gimp-file-load 1  "$<"  "$<"))))  (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $(lastword $^))" ))  (gimp-file-save 1 image (car  (gimp-image-get-active-drawable image)) "$@" "$@")) (gimp-quit 1)'
+	$(call svg2png,$<,$(lastword $^),$@)