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

Speculative fix for building UHT plugins from installed engine builds.

Browse Source 
#rb none
#jira UE-80124

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 8630764 in //UE4/Release-4.23/... via CL 8630878
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8721657 by ben marsh in Dev-Build branch]
This commit is contained in:
ben marsh
2019-09-16 23:47:35 -04:00
parent f46c7635db 92f909a409
commit e41dcbc6a6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,8 +617,8 @@ namespace UnrealBuildTool
throw new BuildException("{0} does not support the {1} configuration", Descriptor.Name, Descriptor.Configuration);
}
// Make sure this target type is supported
if (!InstalledPlatformInfo.IsValid(RulesObject.Type, Descriptor.Platform, Descriptor.Configuration, EProjectType.Code, InstalledPlatformState.Downloaded))
// Make sure this target type is supported. Allow UHT in installed builds as a special case for now.
if (!InstalledPlatformInfo.IsValid(RulesObject.Type, Descriptor.Platform, Descriptor.Configuration, EProjectType.Code, InstalledPlatformState.Downloaded) && Descriptor.Name != "UnrealHeaderTool")
{
if (InstalledPlatformInfo.IsValid(RulesObject.Type, Descriptor.Platform, Descriptor.Configuration, EProjectType.Code, InstalledPlatformState.Supported))
{
@@ -1182,12 +1182,12 @@ namespace UnrealBuildTool
{
ResolveLibraryName(LibraryPath, LibraryName, LibraryExtension, Files);
}
}
}
foreach (string LibraryName in Rules.PublicSystemLibraryPaths)
{
{
foreach (string LibraryPath in SystemLibraryPaths)
{
{
ResolveLibraryName(LibraryPath, LibraryName, LibraryExtension, Files);
}
}
@@ -2691,7 +2691,7 @@ namespace UnrealBuildTool
}
}
}
// Create rules for each remaining module, and check that it's set to be compiled
foreach(string FilteredModuleName in FilteredModuleNames)
{