diff options
| -rwxr-xr-x | emcc | 5 | ||||
| -rwxr-xr-x | emscripten.py | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -1517,9 +1517,8 @@ try: if type(memory_init_file) == int: print >> sys.stderr, 'emcc: warning: memory init file requires typed arrays mode 2' else: memfile = target + '.mem' - seen_memory_init = False + shared.try_delete(memfile) def repl(m): - seen_memory_init = True # handle chunking of the memory initializer s = re.sub('[\[\]\n\(\)\. ]', '', m.groups(0)[0]) s = s.replace('concat', ',') @@ -1535,7 +1534,7 @@ try: open(final + '.mem.js', 'w').write(src) final += '.mem.js' if DEBUG: - if seen_memory_init: + if os.path.exists(memfile): save_intermediate('meminit') print >> sys.stderr, 'emcc: wrote memory initialization to %s' % memfile else: diff --git a/emscripten.py b/emscripten.py index 649b3c0b..91dbe8ff 100755 --- a/emscripten.py +++ b/emscripten.py @@ -305,7 +305,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None, i = 2 if settings['ASM_JS']: i += 2*settings['RESERVED_FUNCTION_POINTERS'] for indexed in indexed_functions: - #print >> sys.stderr, 'indaxx', indexed, i + #print >> sys.stderr, 'function indexing', indexed, i forwarded_json['Functions']['indexedFunctions'][indexed] = i # make sure not to modify this python object later - we use it in indexize i += 2 forwarded_json['Functions']['nextIndex'] = i |