Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
This commit is contained in:
Chris Gagnon
2019-04-22 18:56:08 -04:00
parent 1b21bdd410
commit 56e73ed431
1424 changed files with 77029 additions and 34405 deletions

View File

@@ -32,6 +32,11 @@ namespace UnrealBuildTool
/// </summary>
bool bForDistribution = false;
/// <summary>
/// Override BundleID
/// </summary>
string BundleIdentifier = "";
public XcodeProjectFileGenerator(FileReference InOnlyGameProject, CommandLineArguments CommandLine)
: base(InOnlyGameProject)
{
@@ -39,6 +44,10 @@ namespace UnrealBuildTool
{
bForDistribution = true;
}
if (CommandLine.HasValue("-bundleID="))
{
BundleIdentifier = CommandLine.GetString("-bundleID=");
}
}
/// <summary>
@@ -99,7 +108,7 @@ namespace UnrealBuildTool
/// <returns>The newly allocated project file object</returns>
protected override ProjectFile AllocateProjectFile(FileReference InitFilePath)
{
return new XcodeProjectFile(InitFilePath, OnlyGameProject, bForDistribution);
return new XcodeProjectFile(InitFilePath, OnlyGameProject, bForDistribution, BundleIdentifier);
}
/// ProjectFileGenerator interface