From 9891068394c31d45654a0625b2b115804e8ff46b Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Mon, 20 Jan 2014 22:00:55 -0500
Subject: Makefile build stuff.

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3e3506b..8644167 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ FFMPEG ?= ffmpeg
 FFMPEG += -v warning -y
 OPUSENC ?= opusenc
 ZOPFLIPNG ?= zopflipng
-TRUEPNG ?= wine TruePNG
 DEFLOPT ?= wine DeflOpt
 DEFLUFF ?= defluff
 PNGQUANT ?= pngquant
@@ -34,7 +33,7 @@ video: $(CVIDEO)
 	$(FFMPEG) -i $< -c:v libx264 -preset slower -tune animation -c:a libfdk_aac $@
 
 %.webm: %.mkv
-	$(FFMPEG) -i $< -c:v libvpx -crf 15 -b:v 1M -c:a copy $@
+	$(FFMPEG) -i $< -strict -2 -c:v libvpx-vp9 -crf 8 -b:v 1M -c:a copy $@
 
 %.ogv: %.mkv
 	$(FFMPEG) -i $< -c:v libtheora -qscale:v 10 -c:a copy $@
@@ -52,10 +51,10 @@ audio: $(CAUDIO)
 	$(FFMPEG) -i $< -c:a pcm_s16le $@
 
 %.opus: %.wav
-	$(OPUSENC) --bitrate 64 $< $@
+	$(FFMPEG) -i $< -c:a libopus -b:a 64 $@
 
 %.m4a: %.wav
-	$(FFMPEG) -i $< -c:a libfdk_aac -vbr 2 $@
+	$(FFMPEG) -i $< -c:a libfdk_aac -vbr 1 $@
 
 # === IMAGES ===
 
@@ -79,7 +78,6 @@ images: $(WEBP) $(CTC_ANIM) www/favicon.ico
 	$(CWEBP) -q 99 -m 6 $< -o $@
 
 %.webp: %.jpg
-	$(JPEGMINI) $<
 	$(CWEBP) -q 90 -m 6 $< -o $@
 
 www/favicon.ico: $(DUMP)/ui/icon.png
@@ -88,12 +86,14 @@ www/favicon.ico: $(DUMP)/ui/icon.png
 $(DUMP)/ui/bt-cf-unchecked.webp $(DUMP)/ui/bt-cf-checked.webp: %.webp: %.png
 	$(CONVERT) -trim $< $<
 	$(PNGQUANT) --force --speed 1 --ext .png $<
-	$(TRUEPNG) $< /o max
 	$(ZOPFLIPNG) -m -y $< $<
+	$(DEFLOPT) $<
+	$(DEFLUFF) < $< > TMP$<
 	$(CWEBP) -q 99 -m 6 $< -o $@
 
 $(DUMP)/ui/ctc_strip-0.png: $(CTC_ANIM_SRC)
 	$(CONVERT) $< -crop 16x16 $(patsubst %.png,%*.png,$<)
+	$(PNGQUANT) --force --speed 1 --ext .png $<
 
 $(DUMP)/ui/ctc_strip-%.png: $(CTC_ANIM_SRC) $(DUMP)/ui/ctc_strip-0.png
 	@touch $@
-- 
cgit v1.2.3-70-g09d2