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 /src/settings.js | |
| 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 'src/settings.js')
| -rw-r--r-- | src/settings.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/settings.js b/src/settings.js index 21745ef8..3ecac040 100644 --- a/src/settings.js +++ b/src/settings.js @@ -108,6 +108,7 @@ var PRECISE_I64_MATH = 1; // If enabled, i64 addition etc. is emulated - which i var PRECISE_I32_MUL = 1; // If enabled, i32 multiplication is done with full precision, which means it is // correct even if the value exceeds the JS double-integer limit of ~52 bits (otherwise, // rounding will occur above that range). +var TO_FLOAT32 = 0; // Use Math.toFloat32 var CLOSURE_ANNOTATIONS = 0; // If set, the generated code will be annotated for the closure // compiler. This potentially lets closure optimize the code better. @@ -1391,10 +1392,8 @@ var C_DEFINES = { 'ECOMM': '70', 'EPROTO': '71', 'EMULTIHOP': '74', - 'ELBIN': '75', 'EDOTDOT': '76', 'EBADMSG': '77', - 'EFTYPE': '79', 'ENOTUNIQ': '80', 'EBADFD': '81', 'EREMCHG': '82', @@ -1404,7 +1403,6 @@ var C_DEFINES = { 'ELIBMAX': '86', 'ELIBEXEC': '87', 'ENOSYS': '88', - 'ENMFILE': '89', 'ENOTEMPTY': '90', 'ENAMETOOLONG': '91', 'ELOOP': '92', @@ -1436,14 +1434,11 @@ var C_DEFINES = { 'EISCONN': '127', 'ENOTCONN': '128', 'ETOOMANYREFS': '129', - 'EPROCLIM': '130', 'EUSERS': '131', 'EDQUOT': '132', 'ESTALE': '133', 'ENOTSUP': '134', 'ENOMEDIUM': '135', - 'ENOSHARE': '136', - 'ECASECLASH': '137', 'EILSEQ': '138', 'EOVERFLOW': '139', 'ECANCELED': '140', |