izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

HTML5 - downgrading emscripten back to 1.38.20

Browse Source 
- engine changes to use 1.38.20 toolchain

#jira UE-69753  Multithreaded HTML5 loads into a black screen
#rnx
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4981071 in //UE4/Release-4.22/... via CL 4981072
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5042427 by nick shin in Dev-Anim branch]
This commit is contained in:
nick shin
2019-02-18 14:05:57 -05:00
parent bc1fbf81ae
commit 52f795e79b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Engine/Source/Programs/AutomationTool/HTML5/HTML5Platform.Automation.cs
View File

@@ -149,13 +149,13 @@ public class HTML5Platform : Platform
File.Copy( SrcUE4GameBasename + ".js.mem", UE4GameBasename + ".js.mem", true);
File.SetAttributes(UE4GameBasename + ".js.mem", FileAttributes.Normal);
File.Copy( SrcUE4GameBasename + ".worker.js", UE4GameBasename + ".worker.js", true);
File.SetAttributes(UE4GameBasename + ".worker.js", FileAttributes.Normal);
File.Copy(Path.Combine(Path.GetDirectoryName(_ProjectFullpath), "pthread-main.js"), Path.Combine(PackagePath, "pthread-main.js"), true);
File.SetAttributes(Path.Combine(PackagePath, "pthread-main.js"), FileAttributes.Normal);
}
else
{
// nuke possibly old deployed .worker.js, which is not needed for singlethreaded build.
File.Delete(UE4GameBasename + ".worker.js");
// nuke possibly old deployed pthread-main.js, which is not needed for singlethreaded build.
File.Delete(Path.Combine(PackagePath, "pthread-main.js"));
}
}
// else, c++ projects will compile "to" PackagePath
@@ -249,7 +249,7 @@ public class HTML5Platform : Platform
if (enableMultithreading)
{
CompressionTasks.Add(Task.Factory.StartNew(() => CompressFile(UE4GameBasename + ".js.mem", UE4GameBasename + ".js.memgz"))); // mem init file
CompressionTasks.Add(Task.Factory.StartNew(() => CompressFile(UE4GameBasename + ".worker.js", UE4GameBasename + ".worker.jsgz"))); // pthread file
CompressionTasks.Add(Task.Factory.StartNew(() => CompressFile(PackagePath + "/pthread-main.js", PackagePath + "/pthread-main.jsgz"))); // pthread file
}
Task.WaitAll(CompressionTasks.ToArray());
}
@@ -262,7 +262,7 @@ public class HTML5Platform : Platform
File.Delete(UE4GameBasename + ".jsgz");
File.Delete(UE4GameBasename + ".js.symbolsgz");
File.Delete(UE4GameBasename + ".js.memgz");
File.Delete(UE4GameBasename + ".worker.jsgz");
File.Delete(PackagePath + "/pthread-main.jsgz");
File.Delete(PackagePath + "/Utility.jsgz");
File.Delete(ProjectBasename + ".datagz");
File.Delete(ProjectBasename + ".data.jsgz");
@@ -516,7 +516,7 @@ public class HTML5Platform : Platform
if (enableMultithreading)
{
SC.ArchiveFiles(PackagePath, UE4GameBasename + ".js.mem"); // memory init file
SC.ArchiveFiles(PackagePath, UE4GameBasename + ".worker.js");
SC.ArchiveFiles(PackagePath, "pthread-main.js");
}
// Archive HTML5 Server and a Readme.
@@ -541,7 +541,7 @@ public class HTML5Platform : Platform
if (enableMultithreading)
{
SC.ArchiveFiles(PackagePath, UE4GameBasename + ".js.memgz");
SC.ArchiveFiles(PackagePath, UE4GameBasename + ".worker.jsgz");
SC.ArchiveFiles(PackagePath, "pthread-main.jsgz");
}
}
else
@@ -550,7 +550,7 @@ public class HTML5Platform : Platform
File.Delete(UE4GameBasename + ".wasmgz");
File.Delete(UE4GameBasename + ".jsgz");
File.Delete(UE4GameBasename + ".js.symbolsgz");
File.Delete(UE4GameBasename + ".worker.jsgz");
File.Delete("pthread-main.jsgz");
File.Delete("Utility.jsgz");
File.Delete(ProjectBasename + ".datagz");
File.Delete(ProjectBasename + ".data.jsgz");