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

UnrealBuildTool: track history for AdditionalPluginDirectories

Browse Source 
External plugins will be built in project_dir/Intermediate/External/...

#jira UE-136243
#preflight 61a8efe3ca183f8de48d781f

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18353193 in //UE5/Release-5.0/... via CL 18353223
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18353249 by jonathan adamczewski in ue5-release-engine-test branch]
This commit is contained in:
jonathan adamczewski
2021-12-02 11:49:46 -05:00
parent 30e8d401bc
commit 575aea6fd3
9 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildTarget.cs
View File

@@ -1089,7 +1089,7 @@ namespace UnrealBuildTool
bDeployAfterCompile = InRules.bDeployAfterCompile && !InRules.bDisableLinking && InDescriptor.SpecificFilesToCompile.Count == 0 && InDescriptor.OnlyModuleNames.Count == 0;
// now that we have the platform, we can set the intermediate path to include the platform/architecture name
PlatformIntermediateFolder = GetPlatformIntermediateFolder(Platform, Architecture);
PlatformIntermediateFolder = GetPlatformIntermediateFolder(Platform, Architecture, false);
TargetRulesFile = InRules.File;
@@ -1151,11 +1151,12 @@ namespace UnrealBuildTool
/// </summary>
/// <param name="Platform">Platform to get the folder for</param>
/// <param name="Architecture">Architecture to get the folder for</param>
/// <param name="External">Insert External after Intermediate - for out-of-tree plugins</param>
/// <returns>The output directory for intermediates</returns>
public static string GetPlatformIntermediateFolder(UnrealTargetPlatform Platform, string Architecture)
public static string GetPlatformIntermediateFolder(UnrealTargetPlatform Platform, string Architecture, bool External)
{
// now that we have the platform, we can set the intermediate path to include the platform/architecture name
return Path.Combine("Intermediate", "Build", Platform.ToString(), UEBuildPlatform.GetBuildPlatform(Platform).GetFolderNameForArchitecture(Architecture));
return Path.Combine("Intermediate", External ? "External" : String.Empty, "Build", Platform.ToString(), UEBuildPlatform.GetBuildPlatform(Platform).GetFolderNameForArchitecture(Architecture));
}
/// <summary>
@@ -2991,7 +2992,7 @@ namespace UnrealBuildTool
{
// Get the root output directory and base name (target name/app name) for this binary
DirectoryReference BaseOutputDirectory;
if(bUseSharedBuildEnvironment)
if(bUseSharedBuildEnvironment && ModuleRules.Plugin?.Type != PluginType.External)
{
BaseOutputDirectory = ModuleRules.Context.DefaultOutputBaseDir;
}
@@ -3020,7 +3021,7 @@ namespace UnrealBuildTool
}
// Get the output and intermediate directories for this module
DirectoryReference IntermediateDirectory = DirectoryReference.Combine(BaseOutputDirectory, PlatformIntermediateFolder, AppName, ModuleConfiguration.ToString());
DirectoryReference IntermediateDirectory = DirectoryReference.Combine(BaseOutputDirectory, GetPlatformIntermediateFolder(Platform, Architecture, ModuleRules.Plugin?.Type == PluginType.External), AppName, ModuleConfiguration.ToString());
// Append a subdirectory if the module rules specifies one
if (!String.IsNullOrEmpty(ModuleRules.BinariesSubFolder))