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

Copying //UE4/Dev-VR to Main (//UE4/Main)

Browse Source 
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
This commit is contained in:
Jeff Fisher
2019-06-10 12:22:13 -04:00
parent 2ab7544e7c
commit bcc5bcf128
1062 changed files with 167855 additions and 12078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Programs/UnrealBuildTool/System/TargetReceipt.cs
+18 -2
View File
@@ -275,6 +275,11 @@ namespace UnrealBuildTool
/// </summary>
public UnrealTargetPlatform Platform;
/// <summary>
/// Which platform the target is compiled for
/// </summary>
public string Architecture;
/// <summary>
/// Which configuration this target is compiled in
/// </summary>
@@ -326,7 +331,8 @@ namespace UnrealBuildTool
/// <param name="InPlatform">Platform for the target being compiled</param>
/// <param name="InConfiguration">Configuration of the target being compiled</param>
/// <param name="InVersion">Version information for the target</param>
public TargetReceipt(FileReference InProjectFile, string InTargetName, TargetType InTargetType, UnrealTargetPlatform InPlatform, UnrealTargetConfiguration InConfiguration, BuildVersion InVersion)
/// <param name="InArchitecture">Architecture information for the target</param>
public TargetReceipt(FileReference InProjectFile, string InTargetName, TargetType InTargetType, UnrealTargetPlatform InPlatform, UnrealTargetConfiguration InConfiguration, BuildVersion InVersion, string InArchitecture)
{
ProjectFile = InProjectFile;
ProjectDir = DirectoryReference.FromFile(InProjectFile);
@@ -335,6 +341,7 @@ namespace UnrealBuildTool
Configuration = InConfiguration;
TargetType = InTargetType;
Version = InVersion;
Architecture = InArchitecture;
}
/// <summary>
@@ -542,8 +549,16 @@ namespace UnrealBuildTool
ProjectFile = null;
}
// Read the launch executable
string Architecture;
if (!RawObject.TryGetStringField("Architecture", out Architecture))
{
Architecture = "";
}
// Create the receipt
TargetReceipt Receipt = new TargetReceipt(ProjectFile, TargetName, TargetType, Platform, Configuration, Version);
TargetReceipt Receipt = new TargetReceipt(ProjectFile, TargetName, TargetType, Platform, Configuration, Version, Architecture);
// Get the project directory
DirectoryReference ProjectDir = Receipt.ProjectDir;
@@ -685,6 +700,7 @@ namespace UnrealBuildTool
Writer.WriteValue("Platform", Platform.ToString());
Writer.WriteValue("Configuration", Configuration.ToString());
Writer.WriteValue("TargetType", TargetType.ToString());
Writer.WriteValue("Architecture", Architecture);
if(ProjectFile != null)
{