summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-03-05 18:41:35 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-03-05 18:41:35 -0500
commit6f4c832e1f581addb9590535266a4b78999345ae (patch)
treedef872bcb27c61abc6403434d92a4edfb7db1bc1
parentb71111a0d852263498e610e370ccb94f04b21c8b (diff)
downloadhtml5ks-6f4c832e1f581addb9590535266a4b78999345ae.tar.xz
html5ks-6f4c832e1f581addb9590535266a4b78999345ae.zip
adjust makefile
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 14372c2..cb7c1ec 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SPACE := $(null) $(null)
FFMPEG ?= ffmpeg
FFMPEG += -v warning -y
CWEBP ?= cwebp
-CWEBP += -quiet -alpha_cleanup
+CWEBP += -quiet -alpha_cleanup -m 6
WEBPMUX ?= webpmux
CONVERT ?= convert
APNGASM ?= apngasm
@@ -107,6 +107,7 @@ images: $(CIMAGE)
$(DUMP)/ui/ctc_strip.webp: $(DUMP)/ui/ctc_strip.png
define png2webp =
+ $(CWEBP) -q 99 "$<" -o "$@"
$(PNGQUANT) --force --speed 1 --ext .png "$<"
ifdef ZOPFLIPNG
$(ZOPFLIPNG) -m -y "$<" "$<"
@@ -121,11 +122,10 @@ endif
endef
%.webp: %.png
- $(CWEBP) -q 99 -m 6 "$<" -o "$@"
$(png2webp)
%.webp: %.jpg
- $(CWEBP) -q 90 -m 6 "$<" -o "$@"
+ $(CWEBP) -q 90 "$<" -o "$@"
www/favicon.ico: $(DUMP)/ui/icon.png
$(CONVERT) "$<" -resize 256x256 -transparent white "$@"
@@ -140,7 +140,8 @@ $(DUMP)/ui/ctc_strip-0.png: $(CTC_ANIM_SRC)
$(DUMP)/ui/ctc_strip-%.png: $(CTC_ANIM_SRC) $(DUMP)/ui/ctc_strip-0.png
@
-$(DUMP)/ui/ctc_anim.png: $(CTC_ANIM_TMP)
+# depend on webp to wait for recompression
+$(DUMP)/ui/ctc_anim.png: $(CTC_ANIM_TMP_WEBP)
$(APNGASM) "$@" $^ 3 100
$(DUMP)/ui/ctc_anim.webp: $(CTC_ANIM_TMP_WEBP)