aboutsummaryrefslogtreecommitdiff
path: root/tools/file_packager.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-09-21 15:40:08 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-09-21 15:40:08 -0700
commitbee6e63d8d4420333336cf0aae6c2bbb3582fa1b (patch)
tree0db129554480b5c33c60c249a32a96210c47fa2d /tools/file_packager.py
parentd265c70f489dcb3b3716273fc35fcc817d1a426a (diff)
allow loading multiple asset bundles / outputs of file packager
Diffstat (limited to 'tools/file_packager.py')
-rw-r--r--tools/file_packager.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py
index 25a920b6..0f6a7093 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -300,7 +300,7 @@ if has_preloaded:
curr.response = byteArray.subarray(%d,%d);
curr.onload();
''' % (file_['name'], file_['data_start'], file_['data_end'])
- use_data += " Module['removeRunDependency']('datafile');\n"
+ use_data += " Module['removeRunDependency']('datafile_%s');\n" % data_target
if Compression.on:
use_data = '''
@@ -328,10 +328,10 @@ if has_preloaded:
var curr;
%s
};
- Module['addRunDependency']('datafile');
+ Module['addRunDependency']('datafile_%s');
dataFile.send(null);
if (Module['setStatus']) Module['setStatus']('Downloading...');
- ''' % (os.path.basename(Compression.compressed_name(data_target) if Compression.on else data_target), use_data) # use basename because from the browser's point of view, we need to find the datafile in the same dir as the html file
+ ''' % (os.path.basename(Compression.compressed_name(data_target) if Compression.on else data_target), use_data, data_target) # use basename because from the browser's point of view, we need to find the datafile in the same dir as the html file
if pre_run:
print '''