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

Fixed an issue the BF was seeing with compiling non-unity builds that use the inline gen.cpp macro.

Browse Source 
#preflight 6330d4e3d747fe52c8739b78

[CL 22177396 by bryan sefcik in ue5-main branch]
This commit is contained in:
bryan sefcik
2022-09-25 19:36:22 -04:00
parent e38e01e60a
commit 2a23602913
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildModuleCPP.cs
View File

@@ -565,29 +565,30 @@ namespace UnrealBuildTool
}
}
if (!Target.bDisableInliningGenCpps)
if (GeneratedFiles.Count > 0)
{
// Remove any generated files from the compile list if they are inlined
foreach (FileItem CPPFileItem in CPPFiles)
if (!Target.bDisableInliningGenCpps)
{
var ListOfInlinedGenCpps = ModuleCompileEnvironment.MetadataCache.GetListOfInlinedGeneratedCppFiles(CPPFileItem);
foreach (string ListOfInlinedGenCppsItem in ListOfInlinedGenCpps)
// Remove any generated files from the compile list if they are inlined
foreach (FileItem CPPFileItem in CPPFiles)
{
string? FoundGenCppFile = GeneratedFiles.FirstOrDefault((file) => String.Compare(Path.GetFileName(file), ListOfInlinedGenCppsItem + ".gen.cpp", StringComparison.InvariantCultureIgnoreCase) == 0);
if (FoundGenCppFile != null)
var ListOfInlinedGenCpps = ModuleCompileEnvironment.MetadataCache.GetListOfInlinedGeneratedCppFiles(CPPFileItem);
foreach (string ListOfInlinedGenCppsItem in ListOfInlinedGenCpps)
{
GeneratedFiles.Remove(FoundGenCppFile);
}
else
{
Logger.LogError("Could not find a UObject marked up header file named '{HeaderFile}'", ListOfInlinedGenCppsItem);
string GeneratedCppName = ListOfInlinedGenCppsItem + ".gen.cpp";
string? FoundGenCppFile = GeneratedFiles.FirstOrDefault((file) => String.Compare(Path.GetFileName(file), GeneratedCppName, StringComparison.InvariantCultureIgnoreCase) == 0);
if (FoundGenCppFile != null)
{
GeneratedFiles.Remove(FoundGenCppFile);
}
else
{
Logger.LogError("'{CPPFileItem}' is looking for a generated cpp with named '{HeaderFile}'", CPPFileItem.AbsolutePath, GeneratedCppName);
}
}
}
}
}
if (GeneratedFiles.Count > 0)
{
bool bMergeUnityFiles = Target.bMergeModuleAndGeneratedUnityFiles && Rules.bMergeUnityFiles;
// Create a compile environment for the generated files. We can disable creating debug info here to improve link times.