summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rwxr-xr-xsetup.sh11
2 files changed, 9 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 48d796e..607d18e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,10 @@ FFMPEG ?= ffmpeg
FFMPEG += -v warning $(FFMPEGFLAGS)
OPUSENC ?= opusenc
ZOPFLIPNG ?= zopflipng
+OPTIPNG ?= optipng
JPEGOPTIM ?= jpegoptim
CWEBP ?= cwebp
+CWEBP += -short -alpha_cleanup
WEBPMUX ?= webpmux
CONVERT ?= convert
APNGASM ?= apngasm
@@ -77,6 +79,12 @@ images: $(WEBP) $(CTC_ANIM) www/favicon.ico
www/favicon.ico: $(DUMP)/ui/icon.png
$(CONVERT) $< -resize 256x256 -transparent white $@
+$(DUMP)/ui/bt-cf-unchecked.webp $(DUMP)/ui/bt-cf-checked.webp: %.webp: %.png
+ $(CONVERT) -trim $< $<
+ $(OPTIPNG) -o7 $<
+ $(ZOPFLIPNG) -m -y $< $<
+ $(CWEBP) -q 99 -m 6 $< -o $@
+
$(DUMP)/ui/ctc_strip-0.png: $(CTC_ANIM_SRC)
$(CONVERT) $< -crop 16x16 $(patsubst %.png,%*.png,$<)
diff --git a/setup.sh b/setup.sh
index d6ccf9b..c9f1f00 100755
--- a/setup.sh
+++ b/setup.sh
@@ -7,16 +7,7 @@ cd $(dirname $0)
git submodule update --init
pushd unrpyc
-make install
+make ${MAKEOPTS} install
popd
-trim() {
- for f in "$@"; do
- convert -trim "$f" "$f"
- done
- optipng -o7 "$@"
-}
-
-trim www/dump/ui/bt-cf-unchecked.png www/dump/ui/bt-cf-checked.png
-
make ${MAKEOPTS}