From 1a345826036699d6ab23debd7d51aec9247ed582 Mon Sep 17 00:00:00 2001 From: Kharkunov Eugene Date: Wed, 10 Apr 2024 11:27:41 +0300 Subject: [PATCH] Update js code according to new Emscripten version (3.1.55). Update assets to latest Defold version. Remove armv7-ios from manifest as unsupported platform. --- extension-iap/ext.manifest | 4 - extension-iap/lib/web/library_facebook_iap.js | 6 +- main/main.gui | 100 +++++++++++++++++- 3 files changed, 100 insertions(+), 10 deletions(-) diff --git a/extension-iap/ext.manifest b/extension-iap/ext.manifest index 8cae51e..3a64c62 100644 --- a/extension-iap/ext.manifest +++ b/extension-iap/ext.manifest @@ -1,10 +1,6 @@ name: IAPExt platforms: - armv7-ios: - context: - weakFrameworks: ['StoreKit', 'UIKit', 'Foundation'] - arm64-ios: context: weakFrameworks: ['StoreKit', 'UIKit', 'Foundation'] diff --git a/extension-iap/lib/web/library_facebook_iap.js b/extension-iap/lib/web/library_facebook_iap.js index 3fbdd97..efc878b 100644 --- a/extension-iap/lib/web/library_facebook_iap.js +++ b/extension-iap/lib/web/library_facebook_iap.js @@ -71,7 +71,7 @@ var LibraryFacebookIAP = { if(url_index == product_count-1) { var productsJSON = JSON.stringify(products); - var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK); + var res_buf = stringToUTF8OnStack(productsJSON); {{{ makeDynCall('vii', 'callback')}}}(lua_callback, res_buf); } else { var xmlhttp = new XMLHttpRequest(); @@ -143,7 +143,7 @@ var LibraryFacebookIAP = { } var productsJSON = JSON.stringify(result) - var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK); + var res_buf = stringToUTF8OnStack(productsJSON); {{{ makeDynCall('viii', 'callback')}}}(lua_callback, res_buf, 0); } else { @@ -166,4 +166,4 @@ var LibraryFacebookIAP = { } autoAddDeps(LibraryFacebookIAP, '$FBinner'); -mergeInto(LibraryManager.library, LibraryFacebookIAP); +addToLibrary(LibraryFacebookIAP); diff --git a/main/main.gui b/main/main.gui index 3b59b8d..e14cd15 100644 --- a/main/main.gui +++ b/main/main.gui @@ -1,7 +1,7 @@ script: "/main/main.gui_script" fonts { - name: "system_font" - font: "/builtins/fonts/system_font.font" + name: "default" + font: "/builtins/fonts/default.font" } background_color { x: 0.0 @@ -47,6 +47,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -102,6 +104,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -166,6 +172,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -205,6 +215,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -261,6 +273,10 @@ nodes { overridden_fields: 4 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -325,6 +341,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -360,7 +380,7 @@ nodes { type: TYPE_TEXT blend_mode: BLEND_MODE_ALPHA text: "" - font: "system_font" + font: "default" id: "log" xanchor: XANCHOR_NONE yanchor: YANCHOR_NONE @@ -387,6 +407,10 @@ nodes { template_node_child: false text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -426,6 +450,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -481,6 +507,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -545,6 +575,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -584,6 +618,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -639,6 +675,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -703,6 +743,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -742,6 +786,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -798,6 +844,10 @@ nodes { overridden_fields: 4 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -862,6 +912,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -901,6 +955,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -956,6 +1012,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1020,6 +1080,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1059,6 +1123,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/button.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -1115,6 +1181,10 @@ nodes { overridden_fields: 4 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1179,6 +1249,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1218,6 +1292,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/checkbox_label.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -1273,6 +1349,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1337,6 +1417,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1376,6 +1460,8 @@ nodes { alpha: 1.0 template: "/dirtylarry/checkbox_label.gui" template_node_child: false + custom_type: 0 + enabled: true } nodes { position { @@ -1431,6 +1517,10 @@ nodes { alpha: 1.0 template_node_child: true size_mode: SIZE_MODE_MANUAL + custom_type: 0 + enabled: true + visible: true + material: "" } nodes { position { @@ -1495,6 +1585,10 @@ nodes { template_node_child: true text_leading: 1.0 text_tracking: 0.0 + custom_type: 0 + enabled: true + visible: true + material: "" } material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT