Merge branch 'master' into llvmopts

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;
   }
 }