diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-09-30 13:44:29 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-09-30 13:44:29 -0700 |
| commit | b01d44eb552e77f3a4ff3a0a7cfd19de5082e72c (patch) | |
| tree | c4e274dc3438c5f233151b15042a4f8b40acfe2c /src/compiler.js | |
| parent | 2725cfa316f2749fa6dbedc34e23f5445dfbcf7f (diff) | |
| parent | 2370dd4b6f32b9be38c736b3060ba690a720483f (diff) | |
Merge branch 'incoming' of github.com:ngld/emscripten into incoming1.6.4
Conflicts:
AUTHORS
src/library_sdl.js
tools/shared.py
Diffstat (limited to 'src/compiler.js')
| -rw-r--r-- | src/compiler.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compiler.js b/src/compiler.js index e42f5e19..90060837 100644 --- a/src/compiler.js +++ b/src/compiler.js @@ -206,6 +206,11 @@ if (phase == 'pre') { if (VERBOSE) printErr('VERBOSE is on, this generates a lot of output and can slow down compilation'); +// Load struct and define information. +var temp = JSON.parse(read(STRUCT_INFO)); +C_STRUCTS = temp.structs; +C_DEFINES = temp.defines; + // Load compiler code load('modules.js'); |