Partydeck/IAP-Extension-Mirror
3
0
Fork 0
mirror of https://github.com/defold/extension-iap synced 2025-06-27 10:27:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update js code according to new Emscripten version (3.1.55).

Browse Source 
Update assets to latest Defold version.
Remove armv7-ios from manifest as unsupported platform.
This commit is contained in:
Kharkunov Eugene 2024-04-10 11:27:41 +03:00
parent 09f5060d44
commit 1a34582603
3 changed files with 100 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extension-iap/ext.manifest
View File

@ -1,10 +1,6 @@
name: IAPExt name: IAPExt
platforms: platforms:
armv7-ios:
context:
weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']
arm64-ios: arm64-ios:
context: context:
weakFrameworks: ['StoreKit', 'UIKit', 'Foundation'] weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']

6
extension-iap/lib/web/library_facebook_iap.js
View File

@ -71,7 +71,7 @@ var LibraryFacebookIAP = {
if(url_index == product_count-1) { if(url_index == product_count-1) {
var productsJSON = JSON.stringify(products); 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); {{{ makeDynCall('vii', 'callback')}}}(lua_callback, res_buf);
} else { } else {
var xmlhttp = new XMLHttpRequest(); var xmlhttp = new XMLHttpRequest();
@ -143,7 +143,7 @@ var LibraryFacebookIAP = {
} }
var productsJSON = JSON.stringify(result) 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); {{{ makeDynCall('viii', 'callback')}}}(lua_callback, res_buf, 0);
} else { } else {
@ -166,4 +166,4 @@ var LibraryFacebookIAP = {
} }
autoAddDeps(LibraryFacebookIAP, '$FBinner'); autoAddDeps(LibraryFacebookIAP, '$FBinner');
mergeInto(LibraryManager.library, LibraryFacebookIAP); addToLibrary(LibraryFacebookIAP);

100
main/main.gui
View File

@ -1,7 +1,7 @@
script: "/main/main.gui_script" script: "/main/main.gui_script"
fonts { fonts {
name: "system_font" name: "default"
font: "/builtins/fonts/system_font.font" font: "/builtins/fonts/default.font"
} }
background_color { background_color {
x: 0.0 x: 0.0
@ -47,6 +47,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -102,6 +104,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -166,6 +172,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -205,6 +215,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -261,6 +273,10 @@ nodes {
overridden_fields: 4 overridden_fields: 4
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -325,6 +341,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -360,7 +380,7 @@ nodes {
type: TYPE_TEXT type: TYPE_TEXT
blend_mode: BLEND_MODE_ALPHA blend_mode: BLEND_MODE_ALPHA
text: "<text>" text: "<text>"
font: "system_font" font: "default"
id: "log" id: "log"
xanchor: XANCHOR_NONE xanchor: XANCHOR_NONE
yanchor: YANCHOR_NONE yanchor: YANCHOR_NONE
@ -387,6 +407,10 @@ nodes {
template_node_child: false template_node_child: false
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -426,6 +450,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -481,6 +507,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -545,6 +575,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -584,6 +618,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -639,6 +675,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -703,6 +743,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -742,6 +786,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -798,6 +844,10 @@ nodes {
overridden_fields: 4 overridden_fields: 4
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -862,6 +912,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -901,6 +955,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -956,6 +1012,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1020,6 +1080,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1059,6 +1123,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/button.gui" template: "/dirtylarry/button.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -1115,6 +1181,10 @@ nodes {
overridden_fields: 4 overridden_fields: 4
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1179,6 +1249,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1218,6 +1292,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/checkbox_label.gui" template: "/dirtylarry/checkbox_label.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -1273,6 +1349,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1337,6 +1417,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1376,6 +1460,8 @@ nodes {
alpha: 1.0 alpha: 1.0
template: "/dirtylarry/checkbox_label.gui" template: "/dirtylarry/checkbox_label.gui"
template_node_child: false template_node_child: false
custom_type: 0
enabled: true
} }
nodes { nodes {
position { position {
@ -1431,6 +1517,10 @@ nodes {
alpha: 1.0 alpha: 1.0
template_node_child: true template_node_child: true
size_mode: SIZE_MODE_MANUAL size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
} }
nodes { nodes {
position { position {
@ -1495,6 +1585,10 @@ nodes {
template_node_child: true template_node_child: true
text_leading: 1.0 text_leading: 1.0
text_tracking: 0.0 text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
} }
material: "/builtins/materials/gui.material" material: "/builtins/materials/gui.material"
adjust_reference: ADJUST_REFERENCE_PARENT adjust_reference: ADJUST_REFERENCE_PARENT