partial support for runtime linking of separately-compiled modules (only functions)

1 files changed, 15 insertions, 0 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index b941032a..feebbe5a 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -321,6 +321,10 @@ function JSify(data, functionsOnly, givenFunctions) {
           if (item.ident in EXPORTED_GLOBALS) {
             js += '\nModule["' + item.ident + '"] = ' + item.ident + ';';
           }
+          // TODO: Support exporting BUILD_AS_SHARED_LIB == 2 globals. The problem now is that they override the main file's globals.
+          //if (BUILD_AS_SHARED_LIB == 2) {
+          //  js += 'if (globalScope) globalScope["' + item.ident + '"] = ' + item.ident + ';'; // XXX: assert not overriding
+          //}
           return ret.concat({
             intertype: 'GlobalVariable',
             JS: js,
@@ -603,6 +607,10 @@ function JSify(data, functionsOnly, givenFunctions) {
         func.JS += func.ident + '["X"]=1;';
       }
 
+      if (BUILD_AS_SHARED_LIB == 2) {
+        func.JS += 'if (globalScope) { assert(!globalScope["' + func.ident + '"]); globalScope["' + func.ident + '"] = ' + func.ident + ' }';
+      }
+
       return func;
     }
   });
@@ -1116,7 +1124,14 @@ function JSify(data, functionsOnly, givenFunctions) {
     data.unparsedGlobalss = null;
 
     print(Functions.generateIndexing()); // done last, as it may rely on aliases set in postsets
+
+    // Load runtime-linked libraries
+    RUNTIME_LINKED_LIBS.forEach(function(lib) {
+      print('eval(read("' + lib + '"))(FUNCTION_TABLE.length, this);');
+    });
+
     print(postParts[1]);
+
     print(shellParts[1]);
     // Print out some useful metadata (for additional optimizations later, like the eliminator)
     print('// EMSCRIPTEN_GENERATED_FUNCTIONS: ' + JSON.stringify(Functions.allIdents) + '\n');