From 5b2a9a221ed74fbf10f229f665d05af3a12184c9 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Wed, 5 Mar 2014 19:00:25 -0500 Subject: duh --- Makefile | 5 +++-- Modernizr | 2 +- README.rst | 2 +- fastclick | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5d6f5e1..b5f6edc 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CWEBP += -quiet -alpha_cleanup -m 6 WEBPMUX ?= webpmux CONVERT ?= convert APNGASM ?= apngasm -NPM ?= npm +NPM ?= npm --quiet JS_COMPRESSOR ?= uglifyjs LOCAL_UGLIFYJS := node_modules/.bin/uglifyjs UGLIFYJS ?= $(LOCAL_UGLIFYJS) @@ -16,7 +16,7 @@ PACKR ?= packr CLOSURE_COMPILER ?= java -jar compiler.jar ifndef MINIMAL ZOPFLIPNG ?= zopflipng -DEFLOPT ?= wine DeflOpt +#DEFLOPT ?= wine DeflOpt DEFLUFF ?= defluff PNGQUANT ?= pngquant endif @@ -196,5 +196,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 index 22a9cac..6714aa7 160000 --- a/Modernizr +++ b/Modernizr @@ -1 +1 @@ -Subproject commit 22a9cacbc8dbb0db50d78171e122fdaf5a0bcd16 +Subproject commit 6714aa7c635316101c1b85df08b757771a826514 diff --git a/README.rst b/README.rst index d73258a..7ad7699 100644 --- a/README.rst +++ b/README.rst @@ -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 index 2a044a3..96c956b 160000 --- a/fastclick +++ b/fastclick @@ -1 +1 @@ -Subproject commit 2a044a32484294ea94727769ba99819bffb007a2 +Subproject commit 96c956bbf5efd0f860cfc67499a44927ba5c9b75 -- cgit v1.2.3-54-g00ecf