summaryrefslogtreecommitdiffstats
path: root/platform/web/js/engine/engine.js
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-06-14 17:13:41 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-06-14 17:13:41 +0200
commit71699e08c9df78b7203fa4ef9cede28e995d6ace (patch)
tree6f0f25194fda05a6602a866fb3cb1a417a6360eb /platform/web/js/engine/engine.js
parent087ef4b94278e8b93c6adf79ed5c376c84dee463 (diff)
parent27d67b5ae6678e264a08d43679677b19301f9710 (diff)
downloadredot-engine-71699e08c9df78b7203fa4ef9cede28e995d6ace.tar.gz
Merge pull request #93143 from Faless/web/fix_dlink_emcc_3.1.62
[Web] Fix thread+dlink builds with emscripten 3.1.61+git
Diffstat (limited to 'platform/web/js/engine/engine.js')
-rw-r--r--platform/web/js/engine/engine.js24
1 files changed, 9 insertions, 15 deletions
diff --git a/platform/web/js/engine/engine.js b/platform/web/js/engine/engine.js
index 7e24ad9ae2..04c4c44c5e 100644
--- a/platform/web/js/engine/engine.js
+++ b/platform/web/js/engine/engine.js
@@ -163,25 +163,19 @@ const Engine = (function () {
me.rtenv['initConfig'](config);
// Preload GDExtension libraries.
- const libs = [];
if (me.config.gdextensionLibs.length > 0 && !me.rtenv['loadDynamicLibrary']) {
return Promise.reject(new Error('GDExtension libraries are not supported by this engine version. '
+ 'Enable "Extensions Support" for your export preset and/or build your custom template with "dlink_enabled=yes".'));
}
- me.config.gdextensionLibs.forEach(function (lib) {
- libs.push(me.rtenv['loadDynamicLibrary'](lib, { 'loadAsync': true }));
- });
- return Promise.all(libs).then(function () {
- return new Promise(function (resolve, reject) {
- preloader.preloadedFiles.forEach(function (file) {
- me.rtenv['copyToFS'](file.path, file.buffer);
- });
- preloader.preloadedFiles.length = 0; // Clear memory
- me.rtenv['callMain'](me.config.args);
- initPromise = null;
- me.installServiceWorker();
- resolve();
- });
+ return new Promise(function (resolve, reject) {
+ for (const file of preloader.preloadedFiles) {
+ me.rtenv['copyToFS'](file.path, file.buffer);
+ }
+ preloader.preloadedFiles.length = 0; // Clear memory
+ me.rtenv['callMain'](me.config.args);
+ initPromise = null;
+ me.installServiceWorker();
+ resolve();
});
});
},