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

- Proper fix to merge conflicts

Browse Source 
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]
This commit is contained in:
josh adams
2019-02-16 07:13:44 -05:00
parent 4bab8246c2
commit 8ba99b94de
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
View File

@@ -1886,7 +1886,27 @@ public partial class Project : CommandUtils
{
FileReference PrimaryOrderFile = (PakOrderFileLocations.Count >= 1) ? PakOrderFileLocations[0] : null;
FileReference SecondaryOrderFile = (PakOrderFileLocations.Count >= 2) ? PakOrderFileLocations[1] : null;
Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PrimaryOrderFile, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + CompressionFormats + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid, SecondaryOrderFile));
string BulkOption = "";
{
ConfigHierarchy PlatformGameConfig;
if (Params.EngineConfigs.TryGetValue(SC.StageTargetPlatform.PlatformType, out PlatformGameConfig))
{
bool bMasterEnable = false;
PlatformGameConfig.GetBool("MemoryMappedFiles", "MasterEnable", out bMasterEnable);
if (bMasterEnable)
{
int Value = 0;
PlatformGameConfig.GetInt32("MemoryMappedFiles", "Alignment", out Value);
if (Value > 0)
{
BulkOption = String.Format(" -AlignForMemoryMapping={0}", Value);
}
}
}
}
Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PrimaryOrderFile, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + BulkOption + CompressionFormats + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid, SecondaryOrderFile));
LogNames.Add(OutputLocation.GetFileNameWithoutExtension());
}
}