diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-19 07:40:01 -0500 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-19 07:53:42 -0500 |
| commit | ff8daa70d9df03aec165c9aa0c177f94a283482d (patch) | |
| tree | 97e60bfbe339aa7ff2c2e1473d4e95a8bf986317 /Makefile | |
| parent | 68489f7c5c3689483cd0d430e1c015832e8a0ec4 (diff) | |
| download | html5ks-ff8daa70d9df03aec165c9aa0c177f94a283482d.tar.xz html5ks-ff8daa70d9df03aec165c9aa0c177f94a283482d.zip | |
asdf
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -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 |