diff options
| -rw-r--r-- | Makefile | 24 | ||||
| m--------- | Modernizr | 0 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| m--------- | fastclick | 0 |
4 files changed, 11 insertions, 15 deletions
@@ -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 @@ -17,7 +17,7 @@ PACKR ?= packr CLOSURE_COMPILER ?= java -jar compiler.jar ifndef MINIMAL ZOPFLIPNG ?= zopflipng -DEFLOPT ?= wine DeflOpt +#DEFLOPT ?= wine DeflOpt DEFLUFF ?= defluff PNGQUANT ?= pngquant endif @@ -108,25 +108,19 @@ 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 "$<" "$<" -endif -ifdef DEFLOPT - $(DEFLOPT) "$<" -endif -ifdef DEFLUFF - $(DEFLUFF) < "$<" > "$<".tmp + $(if $(ZOPFLIPNG), $(ZOPFLIPNG) -m -y "$<" "$<") + $(if $(DEFLOPT),$(DEFLOPT) "$<") + $(if $(DEFLUFF),$(DEFLUFF) < "$<" > "$<".tmp) mv -f "$<".tmp "$<" -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 "$@" @@ -141,7 +135,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) @@ -202,5 +197,6 @@ watch: MAKEFLAGS=-r .SUFFIXES: +.SECONDARY: $(WAV) .INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP) .PHONY: video audio images js jshint clean space watch diff --git a/Modernizr b/Modernizr -Subproject 22a9cacbc8dbb0db50d78171e122fdaf5a0bcd1 +Subproject 6714aa7c635316101c1b85df08b757771a82651 @@ -41,7 +41,7 @@ Recommended Build steps ----------- -0. Get Katawa Shoujo. +0. Get Katawa Shoujo, install prerequisites. For guidance on Ubuntu, see .travis.sh. 1. Copy \*.rpyc from Katawa Shoujo/game into unrpyc/ directory. 2. Extract files from Katawa Shoujo/game/data.rpa with an rpa extractor, e.g. unrpa. Put files in www/dump. 3. Install prerequisites, download DeflOpt and defluff and place exes in this directory. diff --git a/fastclick b/fastclick -Subproject 2a044a32484294ea94727769ba99819bffb007a +Subproject 96c956bbf5efd0f860cfc67499a44927ba5c9b7 |