From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Tue, 26 Aug 2014 16:16:55 +0000 (+0200)
Subject: Ditch Inkscape.
X-Git-Url: https://git.yukkurigames.com/?p=mlpccg.git;a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=575d449fb047ad4315d699b681f5fb3b65908486;ds=sidebyside

Ditch Inkscape.
---

diff --git a/Makefile b/Makefile
index c6323f5..1dee560 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,17 @@ appcache>contents = $(shell grep -vFx -e "*" -e "CACHE MANIFEST" -e "CACHE:" -e
 mlpccg.appcache: $(call appcache>contents,mlpccg.appcache)
 	sed -i '' "s/^# Last-Updated: .*$$/# Last-Updated: `date -u +'%Y-%m-%dT%H:%M:%SZ'`/" $@
 
-INKSCAPE := $(firstword $(shell command -v inkscape /Applications/Inkscape.app/Contents/Resources/bin/inkscape) inkscape)
+CONVERT.svg.png ?= rsvg-convert -f png
+CONVERT.png.ico ?= convert
 
 FAVICON_SIZES = 32 57 64 72 76 114 120 144 152 196 256
 FAVICONS = $(patsubst %,favicon_%.png,$(FAVICON_SIZES)) favicon.ico
 
 favicon_%.png: favicon.svg
-	$(INKSCAPE) -z -e $@ -w $* -h $* $<
+	$(CONVERT.svg.png) -w $* -h $* < $< > $@
 
 %.ico: %_48.png %_32.png %_24.png %_64.png %_16.png
-	convert $^ $@
+	$(CONVERT.png.ico) $^ $@
 
 all: $(FAVICONS) mlpccg.appcache