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

Fix ListThirdPartySoftware commandlet when running using the remote toolchain, and fix UBT error codes being ignored.

Browse Source 
#rb none
#codereview Wes.Hunt
#lockdown Nick.Penwarden

[CL 3332594 by Ben Marsh in Main branch]
This commit is contained in:
Ben Marsh
2017-03-04 14:42:03 -05:00
parent 4f5c06f5a9
commit 6ed277695b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Engine/Source/Programs/AutomationTool/Scripts/ListThirdPartySoftware.Automation.cs
View File

@@ -85,7 +85,11 @@ class ListThirdPartySoftware : BuildCommand
{
FileReference OutputFile = FileReference.Combine(CommandUtils.EngineDirectory, "Intermediate", "Build", "ThirdParty.json");
Run(UE4Build.GetUBTExecutable(), String.Format("{0} {1} {2} -jsonexport=\"{3}\" -skipbuild", Target, Configuration, Platform, OutputFile.FullName), Options: DebugRun ? ERunOptions.Default : ERunOptions.NoLoggingOfRunCommand);
IProcessResult Result = Run(UE4Build.GetUBTExecutable(), String.Format("{0} {1} {2} -jsonexport=\"{3}\" -skipbuild", Target, Configuration, Platform, OutputFile.FullName), Options: DebugRun ? ERunOptions.Default : ERunOptions.NoLoggingOfRunCommand);
if(Result.ExitCode != 0)
{
throw new AutomationException("Failed to run UBT");
}
JsonObject Object = JsonObject.Read(OutputFile.FullName);

4
Engine/Source/Programs/UnrealBuildTool/Mac/UEBuildMac.cs
View File

@@ -102,8 +102,8 @@ namespace UnrealBuildTool
Target.bUsePCHFiles = false;
}
// Needs OS X 10.11 for Metal
if (MacToolChain.Settings.MacOSSDKVersionFloat >= 10.11f && Target.bCompileAgainstEngine)
// Needs OS X 10.11 for Metal. The remote toolchain has not been initialized yet, so just assume it's a recent SDK.
if ((BuildHostPlatform.Current.Platform != UnrealTargetPlatform.Mac || MacToolChain.Settings.MacOSSDKVersionFloat >= 10.11f) && Target.bCompileAgainstEngine)
{
Target.GlobalDefinitions.Add("HAS_METAL=1");
Target.ExtraModuleNames.Add("MetalRHI");