aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-07 16:43:18 -0500
committerAlon Zakai <alonzakai@gmail.com>2014-02-07 16:43:18 -0500
commit4a2e11d8d484fad8440e56e49fb2ad9932dbe570 (patch)
treefce0ae66aefa8393a13d447c51063c238d6df3b4
parent94c4724ebf1d60a86630f0097b560ffffd4be865 (diff)
move deps info to file
-rwxr-xr-xemcc13
-rw-r--r--src/deps_info.json5
2 files changed, 10 insertions, 8 deletions
diff --git a/emcc b/emcc
index 7fac9a50..1e1e6621 100755
--- a/emcc
+++ b/emcc
@@ -47,7 +47,7 @@ emcc can be influenced by a few environment variables:
EMMAKEN_COMPILER - The compiler to be used, if you don't want the default clang.
'''
-import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging
+import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging, json
from subprocess import PIPE, STDOUT
from tools import shared, jsrun
from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename, WINDOWS
@@ -1745,18 +1745,15 @@ try:
# added to here, because our deps go only one way (each library here is checked, then we check the next
# in order - libcxx, libcxextra, etc. - and then we run the JS compiler and provide extra symbols from
# library*.js files. But we cannot then go back to the C libraries if a new dep was added!
- def add_back_needs(need):
- back_needs = {
- 'uuid_compare': ['memcmp'],
- 'SDL_Init': ['malloc', 'free'],
- }
- for ident, deps in back_needs.iteritems():
+ deps_info = json.loads(open(shared.path_from_root('src', 'deps_info.json')).read())
+ def add_back_deps(need):
+ for ident, deps in deps_info.iteritems():
if ident in need.undefs:
for dep in deps:
need.undefs.add(dep)
shared.Settings.EXPORTED_FUNCTIONS.append('_' + dep)
for symbols in symbolses:
- add_back_needs(symbols)
+ add_back_deps(symbols)
all_needed = set()
for symbols in symbolses:
diff --git a/src/deps_info.json b/src/deps_info.json
new file mode 100644
index 00000000..5bdc75bc
--- /dev/null
+++ b/src/deps_info.json
@@ -0,0 +1,5 @@
+{
+ "uuid_compare": ["memcmp"],
+ "SDL_Init": ["malloc", "free"]
+}
+