aboutsummaryrefslogtreecommitdiff
path: root/emscripten.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-12-02 20:21:06 -0500
committerAlon Zakai <alonzakai@gmail.com>2013-12-02 20:21:06 -0500
commit205d1f08541b5fc6f4c667b5d8064806319a13af (patch)
treefa9e6f8532859a346e38ff1c5216e8ae06e48327 /emscripten.py
parentcc821ba9e5ed53720351839cce833196381ed2a6 (diff)
be sure to not emit an external ref as both a var and a func in fastcomp
Diffstat (limited to 'emscripten.py')
-rwxr-xr-xemscripten.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py
index da3b5361..a507b0bf 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -995,7 +995,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None,
pass
# If no named globals, only need externals
global_vars = metadata['externs'] #+ forwarded_json['Variables']['globals']
- global_funcs = list(set(['_' + key for key, value in forwarded_json['Functions']['libraryFunctions'].iteritems() if value != 2])) # + metadata['externFuncs']/'declares'
+ global_funcs = list(set(['_' + key for key, value in forwarded_json['Functions']['libraryFunctions'].iteritems() if value != 2]).difference(set(global_vars))) # + metadata['externFuncs']/'declares'
def math_fix(g):
return g if not g.startswith('Math_') else g.split('_')[1]
asm_global_funcs = ''.join([' var ' + g.replace('.', '_') + '=global.' + g + ';\n' for g in maths]) + \