Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 10:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed running the export templates with newer emscripten versions.

Browse source 
(cherry picked from commit 6f1d6cfc78)
This commit is contained in:
Relintai 2019-10-01 14:55:54 +02:00 • committed by Rémi Verschelde
parent 89f26c9479
commit 0587df4aa5
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
platform/javascript/engine.js
View file

@ -94,6 +94,7 @@
return new Promise(function(resolve, reject) {
rtenvProps.onRuntimeInitialized = resolve;
rtenvProps.onAbort = reject;
rtenvProps.thisProgram = executableName;
rtenvProps.engine.rtenv = Engine.RuntimeEnvironment(rtenvProps, LIBS);
});
}
@ -130,13 +131,11 @@
);
};
this.startGame = function(mainPack) {
this.startGame = function(execName, mainPack) {
executableName = execName;
var mainArgs = [ '--main-pack', mainPack ];
executableName = getBaseName(mainPack);
var mainArgs = [];
if (!getPathLeaf(mainPack).endsWith('.pck')) {
mainArgs = ['--main-pack', getPathLeaf(mainPack)];
}
return Promise.all([
// Load from directory,
this.init(getBasePath(mainPack)),
@ -187,8 +186,6 @@
this.rtenv.locale = this.rtenv.locale.split('.')[0];
this.rtenv.resizeCanvasOnStart = resizeCanvasOnStart;
this.rtenv.thisProgram = executableName || getBaseName(basePath);
preloadedFiles.forEach(function(file) {
var dir = LIBS.PATH.dirname(file.path);
try {