diff options
| author | ToadKing <toadking@toadking.com> | 2013-08-12 23:30:49 -0400 |
|---|---|---|
| committer | ToadKing <toadking@toadking.com> | 2013-08-12 23:30:49 -0400 |
| commit | 7466223864929d50d02407dde1da331133a0bef1 (patch) | |
| tree | 60403b8061880e6aea503a20d9c45b3e678ec6ad /emscripten.py | |
| parent | c2b064eb49ea63eec59add5751c8a9c2b80dab92 (diff) | |
| parent | 3090cdd713609a9d3f749d13002a898e03cbd5e3 (diff) | |
Merge branch 'incoming' of https://github.com/kripken/emscripten into fixed_openal_buffers
Conflicts:
src/library_openal.js
Diffstat (limited to 'emscripten.py')
| -rwxr-xr-x | emscripten.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/emscripten.py b/emscripten.py index 217fd6d5..1b1284c7 100755 --- a/emscripten.py +++ b/emscripten.py @@ -423,6 +423,8 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None, math_envs = ['Math.min'] # TODO: move min to maths asm_setup += '\n'.join(['var %s = %s;' % (f.replace('.', '_'), f) for f in math_envs]) + if settings['TO_FLOAT32']: maths += ['Math.toFloat32'] + basic_funcs = ['abort', 'assert', 'asmPrintInt', 'asmPrintFloat'] + [m.replace('.', '_') for m in math_envs] if settings['RESERVED_FUNCTION_POINTERS'] > 0: basic_funcs.append('jsCall') if settings['SAFE_HEAP']: basic_funcs += ['SAFE_HEAP_LOAD', 'SAFE_HEAP_STORE', 'SAFE_HEAP_CLEAR'] |