summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Firshman <ben@firshman.co.uk>2013-07-25 10:15:19 -0700
committerBen Firshman <ben@firshman.co.uk>2013-07-25 10:15:19 -0700
commit7ad5da88e9af9e4bcef5aabc64ca52f344dc685a (patch)
treebb4da6421f16ba740b218bf93cb681a69b237b6c
parenta5526ed2c4b7c2cc7ed9cc9043c4054bd34a69c5 (diff)
parent2a6ea1e753f7ee878a301b02d869eedc1fd87e6c (diff)
downloadjsnes-7ad5da88e9af9e4bcef5aabc64ca52f344dc685a.zip
jsnes-7ad5da88e9af9e4bcef5aabc64ca52f344dc685a.tar.gz
jsnes-7ad5da88e9af9e4bcef5aabc64ca52f344dc685a.tar.bz2
Merge pull request #29 from wmh/master
Modified gruntfile to explicitly concatenate js in order
-rw-r--r--Gruntfile.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 26dffe4..d2f3ca8 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -3,7 +3,7 @@ module.exports = (grunt) ->
pkg: grunt.file.readJSON('package.json')
concat:
source:
- src: "source/*.js"
+ src: ["source/nes.js", "source/utils.js", "source/cpu.js", "source/keyboard.js", "source/mappers.js", "source/papu.js", "source/ppu.js", "source/rom.js", "source/ui.js"]
dest: "build/jsnes.js"
uglify:
source: