aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-01-31 18:11:28 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-01-31 18:11:28 -0800
commit88c3f163048d7f9107f314c98fc94abc9271d641 (patch)
treed94283c0e1b1de0f3c2aefa9db44040ec7885183 /src
parentf6c2ee75635583e2652df34045464ce908645044 (diff)
parent195c3e39cc0fba69d551836e7806d1cb55b742f0 (diff)
Merge branch 'master' into llvmopts
Diffstat (limited to 'src')
-rw-r--r--src/library_sdl.js2
-rw-r--r--src/parseTools.js7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index d438fc23..35c619b8 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -561,6 +561,8 @@ mergeInto(LibraryManager.library, {
Mix_OpenAudio: function() { return -1 },
+ SDL_InitSubSystem: function(flags) { return 0 },
+
SDL_AddTimer: function(interval, callback, param) {
return window.setTimeout(function() {
FUNCTION_TABLE[callback](interval, param);
diff --git a/src/parseTools.js b/src/parseTools.js
index 38467270..a53ff1c0 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -390,7 +390,12 @@ function finalizeParam(param) {
if (param.type == 'i64' && I64_MODE == 1) {
return parseI64Constant(param.ident);
}
- return toNiceIdent(param.ident);
+ var ret = toNiceIdent(param.ident);
+ if (ret in Variables.globals && Variables.globals[ret].isString) {
+ ret = "STRING_TABLE." + ret;
+ }
+
+ return ret;
}
}