aboutsummaryrefslogtreecommitdiff
path: root/src/compiler.js
diff options
context:
space:
mode:
authorngld <ngld@tproxy.de>2013-09-16 23:49:19 +0200
committerngld <ngld@tproxy.de>2013-09-16 23:49:19 +0200
commit1600df2e360d0bbfd9195b3523dd3d0b440fe62a (patch)
tree8b6dc4e1f9b79520154025f5adbddc166eb069f7 /src/compiler.js
parente0cd2c4078c5dbaecda881c9258f01d5069a1d02 (diff)
Integrate the new tool into emscripten
Automatically compile struct_info.json and save the compiled version in the emscripten cache.
Diffstat (limited to 'src/compiler.js')
-rw-r--r--src/compiler.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compiler.js b/src/compiler.js
index f2b0dcbd..69824035 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -204,6 +204,12 @@ 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;
+// NOTE: This overwrites C_DEFINES from settings.js, should this be fixed or will C_DEFINES in settings.js be deprecated?
+C_DEFINES = temp.defines;
+
// Load compiler code
load('framework.js');