From ff8daa70d9df03aec165c9aa0c177f94a283482d Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Wed, 19 Feb 2014 07:40:01 -0500
Subject: asdf

---
 .travis.sh | 13 +++++++------
 Makefile   | 10 ++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index e09102e..9c145f8 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -11,12 +11,15 @@ case "$1" in
     curl -L http://downloads.sourceforge.net/project/opencore-amr/fdk-aac/fdk-aac-0.1.3.tar.gz | tar -xz
     curl http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz | tar -xz
     curl http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 | tar -xj
+    curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
+
     curl http://dl.katawa-shoujo.com/gold_1.1/%5B4ls%5D_katawa_shoujo_1.1-%5Blinux-x86%5D%5BB5C707D5%5D.tar.bz2 | tar -xj --strip-components 2 --wildcards "Katawa Shoujo-linux-x86/game/script-a*" "Katawa Shoujo-linux-x86/game/imachine.rpyc" "Katawa Shoujo-linux-x86/game/ui-strings.rpyc" "Katawa Shoujo-linux-x86/game/ui-strings_FR.rpyc" "Katawa Shoujo-linux-x86/game/data.rpa"
     mv *.rpyc unrpyc
-    curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
     ;;
   install)
-    sudo apt-get install -q libjpeg-progs libtheora-dev libvpx-dev libx264-dev webp yasm
+    sudo apt-get install -q libjpeg-progs libtheora-dev libvpx-dev libx264-dev npm webp yasm
+
+    sudo npm install -g grunt-cli uglifyjs
 
     cd fdk-aac-0.1.3
     ./configure --disable-shared
@@ -36,16 +39,14 @@ case "$1" in
     sudo make install
     cd ..
 
-    curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa
-    rm data.rpa
-
     cd libwebp-0.4.0
     ./configure
     make $MAKEOPTS
     sudo make install
     cd ..
 
-    sudo npm install -g grunt-cli uglifyjs
+    curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa
+    rm data.rpa
     ;;
   script)
     exec ./setup.sh "$@"
diff --git a/Makefile b/Makefile
index 0e3e0bc..ee7409d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,7 @@ CWEBP += -short -alpha_cleanup
 WEBPMUX ?= webpmux
 CONVERT ?= convert
 APNGASM ?= apngasm
-UGLIFYJS ?= uglifyjs
-GRUNT ?= grunt
+UGLIFYJS ?= node_modules/.bin/uglifyjs
 ifdef MINIMAL
 ZOPFLIPNG ?= zopflipng
 DEFLOPT ?= wine DeflOpt
@@ -26,10 +25,9 @@ DUMP ?= www/dump
 all: modules video audio images js
 
 # === GIT SUBMODULES ===
-modules:
-	git submodule update --init
+Modernizr/dist/modernizr-build.js: config-all.json
 	ln -fs ../../config-all.json Modernizr/lib/config-all.json
-	cd Modernizr && npm update && $(GRUNT) build
+	cd Modernizr && npm update && node_modules/.bin/grunt build
 
 # === VIDEO ===
 
@@ -133,7 +131,7 @@ $(DUMP)/ui/ctc_anim.webp: $(CTC_ANIM_TMP_WEBP)
 
 MYJS := www/js/html5ks.js www/js/menu.js www/js/api.js www/js/characters.js www/js/imachine.js www/js/i18n.js
 JSLIBS := www/js/lib/when/when.js www/js/lib/fastclick/lib/fastclick.js \
-          www/js/lib/Modernizr/dist/modernizr-build.js www/js/lib/spin.js/spin.js
+          Modernizr/dist/modernizr-build.js www/js/lib/spin.js/spin.js
 JSDATA := www/js/play.js www/js/images.js
 JS := $(JSLIBS) $(MYJS) $(JSDATA)
 JSOUT := www/js/all.min.js
-- 
cgit v1.2.3-54-g00ecf