fix emscripten to sdk-1.37.40-64bit for now, because later versions r…

…equire updates I dont have time for now
ianmaclarty · Sep 17, 2019 · 4efda2b · 4efda2b
1 parent e68f9ed
commit 4efda2b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Common.mk b/Common.mk
@@ -130,7 +130,7 @@ C99_OPT = -std=c99
 
 EMSCRIPTEN_LIBS = html/library_sdl.js
 EMSCRIPTEN_LIBS_OPTS = $(patsubst %,--js-library %,$(EMSCRIPTEN_LIBS))
-EMSCRIPTEN_EXPORTS_OPT = -s EXPORTED_FUNCTIONS="['_main', '_am_emscripten_run', '_am_emscripten_run_waiting', '_am_emscripten_pause', '_am_emscripten_resume', '_am_emscripten_resize']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['Pointer_stringify', 'ccall', 'writeStringToMemory']" -s BINARYEN_TRAP_MODE=clamp
+EMSCRIPTEN_EXPORTS_OPT = -s EXPORTED_FUNCTIONS="['_main', '_am_emscripten_run', '_am_emscripten_run_waiting', '_am_emscripten_pause', '_am_emscripten_resume', '_am_emscripten_resize']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['Pointer_stringify', 'ccall', 'stringToUTF8', 'lengthBytesUTF8']" -s BINARYEN_TRAP_MODE=clamp
 
 TARGET_CFLAGS=-ffast-math
 

diff --git a/scripts/travis.sh b/scripts/travis.sh
@@ -70,7 +70,7 @@ else
 
         # build emscripten
         # (building on osx, because the pre-built llvm binaries don't work on linux due to incompatible glibc version)
-        EMSDK=latest
+        EMSDK=sdk-1.37.40-64bit
         git clone https://github.com/juj/emsdk.git emscripten
         cd emscripten
         ./emsdk install $EMSDK

diff --git a/src/am_browser.cpp b/src/am_browser.cpp
@@ -14,8 +14,9 @@ static int eval_js(lua_State *L) {
         } else {
             res_str = JSON.stringify(res);
         }
-        var buffer = Module._malloc(res_str.length+1);
-        Module.writeStringToMemory(res_str, buffer);
+        var len = Module.lengthBytesUTF8(res_str) + 1;
+        var buffer = Module._malloc(len);
+        Module.stringToUTF8(res_str, buffer, len);
         return buffer;
     }, (int)js);
     char *res_str = (char*)res_ptr;

diff --git a/src/am_http.cpp b/src/am_http.cpp
@@ -97,8 +97,9 @@ static void get_response(lua_State *L, void *obj) {
         var xhr = window.amulet.http_reqs[$0];
         var txt = xhr.responseText;
         if (txt == null) return 0;
-        var buffer = Module._malloc(txt.length+1);
-        Module.writeStringToMemory(txt, buffer);
+        var len = Module.lengthBytesUTF8(txt) + 1;
+        var buffer = Module._malloc(len);
+        Module.stringToUTF8(txt, buffer, len);
         return buffer;
     }, req->id);
     if (text_ptr == 0) {