diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-25 20:55:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 20:55:58 +0100 |
| commit | 26c9e86bc0d4e46b0e1020b39b7ef81b431dec2b (patch) | |
| tree | 54fc7d9d65332f499bd2e5dcee7da130ceaa764d /platform/javascript/js | |
| parent | d7aea6ff6c54466dba51b75de5942154fbffe75d (diff) | |
| parent | 6f64d9366439c0df0628c41e98e315059fb5bf0f (diff) | |
Merge pull request #45456 from Faless/js/4.x_styles
[HTML5] Better editor HTML, small refactor.
Diffstat (limited to 'platform/javascript/js')
| -rw-r--r-- | platform/javascript/js/dynlink.pre.js | 1 | ||||
| -rw-r--r-- | platform/javascript/js/engine/engine.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/platform/javascript/js/dynlink.pre.js b/platform/javascript/js/dynlink.pre.js deleted file mode 100644 index 34bc371ea9..0000000000 --- a/platform/javascript/js/dynlink.pre.js +++ /dev/null @@ -1 +0,0 @@ -Module['dynamicLibraries'] = [Module['thisProgram'] + '.side.wasm'].concat(Module['dynamicLibraries'] ? Module['dynamicLibraries'] : []); diff --git a/platform/javascript/js/engine/engine.js b/platform/javascript/js/engine/engine.js index 4b8a7dde69..01232cbece 100644 --- a/platform/javascript/js/engine/engine.js +++ b/platform/javascript/js/engine/engine.js @@ -62,7 +62,7 @@ const Engine = (function () { // Emscripten configuration. config['thisProgram'] = me.executableName; config['noExitRuntime'] = true; - config['dynamicLibraries'] = me.gdnativeLibs; + config['dynamicLibraries'] = [`${me.executableName}.side.wasm`].concat(me.gdnativeLibs); Godot(config).then(function (module) { module['initFS'](me.persistentPaths).then(function (fs_err) { me.rtenv = module; |