Merge pull request #5 from ekharkunov/emscripten-update

Update js code to latest Emscripten (3.1.55).
defold · Apr 11, 2024 · 2abe1f7 · 2abe1f7
2 parents adcf363 + 233d113
commit 2abe1f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 .externalToolBuilders
 .DS_Store
 .lock-wscript
@@ -9,3 +8,4 @@ build
 builtins
 .internal
 .clang_complete
+*.der
diff --git a/webmonetization/lib/web/library_webmonetization.js b/webmonetization/lib/web/library_webmonetization.js
@@ -15,26 +15,26 @@ var WebMonetizationLibrary = {
 
         document.monetization.addEventListener("", event => {
             {{{ makeDynCall("vii", "Context.listener") }}} (
-                allocate(intArrayFromString("monetizationpending"), ALLOC_STACK),
-                allocate(intArrayFromString(JSON.stringify(event.detail !== undefined ? event.detail : {})), ALLOC_STACK)
+                stringToUTF8OnStack("monetizationpending"),
+                stringToUTF8OnStack(JSON.stringify(event.detail !== undefined ? event.detail : {}))
             );
         });
         document.monetization.addEventListener("monetizationstart", event => {
             {{{ makeDynCall("vii", "Context.listener") }}} (
-                allocate(intArrayFromString("monetizationstart"), ALLOC_STACK),
-                allocate(intArrayFromString(JSON.stringify(event.detail !== undefined ? event.detail : {})), ALLOC_STACK)
+                stringToUTF8OnStack("monetizationstart"),
+                stringToUTF8OnStack(JSON.stringify(event.detail !== undefined ? event.detail : {}))
             );
         });
         document.monetization.addEventListener("monetizationprogress", event => {
             {{{ makeDynCall("vii", "Context.listener") }}} (
-                allocate(intArrayFromString("monetizationprogress"), ALLOC_STACK),
-                allocate(intArrayFromString(JSON.stringify(event.detail !== undefined ? event.detail : {})), ALLOC_STACK)
+                stringToUTF8OnStack("monetizationprogress"),
+                stringToUTF8OnStack(JSON.stringify(event.detail !== undefined ? event.detail : {}))
             );
         });
         document.monetization.addEventListener("monetizationstop", event => {
             {{{ makeDynCall("vii", "Context.listener") }}} (
-                allocate(intArrayFromString("monetizationstop"), ALLOC_STACK),
-                allocate(intArrayFromString(JSON.stringify(event.detail !== undefined ? event.detail : {})), ALLOC_STACK)
+                stringToUTF8OnStack("monetizationstop"),
+                stringToUTF8OnStack(JSON.stringify(event.detail !== undefined ? event.detail : {}))
             );
         });
     },
@@ -47,4 +47,4 @@ var WebMonetizationLibrary = {
 
 autoAddDeps(WebMonetizationLibrary, "$Context");
 
-mergeInto(LibraryManager.library, WebMonetizationLibrary);
+addToLibrary(WebMonetizationLibrary);