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

Fix building on Mac using distcc which seperates pre-processing and compilation.

Browse Source 
#codereview michael.trepka

[CL 2097023 by Mark Satterthwaite in Main branch]
This commit is contained in:
Mark Satterthwaite
2014-06-06 06:37:48 -04:00
committed by UnrealBot
parent 7cb8d165ef
commit 83ba1896f4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/ShaderCore/Private/ShaderParameters.cpp
+3 -3
View File
@@ -89,7 +89,7 @@ void FShaderUniformBufferParameter::ModifyCompilationEnvironment(const TCHAR* Pa
);
FString& GeneratedUniformBuffersInclude = OutEnvironment.IncludeFileNameToContentsMap.FindOrAdd("GeneratedUniformBuffers.usf");
GeneratedUniformBuffersInclude += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"")LINE_TERMINATOR, ParameterName);
GeneratedUniformBuffersInclude += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"") LINE_TERMINATOR, ParameterName);
Struct.AddResourceTableEntries(OutEnvironment.ResourceTableMap, OutEnvironment.ResourceTableLayoutHashes);
}
@@ -356,7 +356,7 @@ void FShaderType::AddReferencedUniformBufferIncludes(FShaderCompilerEnvironment&
for (TMap<const TCHAR*,FCachedUniformBufferDeclaration>::TConstIterator It(ReferencedUniformBufferStructsCache); It; ++It)
{
check(It.Value().Declaration[Platform].Len() > 0);
UniformBufferIncludes += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"")LINE_TERMINATOR, It.Key());
UniformBufferIncludes += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"") LINE_TERMINATOR, It.Key());
OutEnvironment.IncludeFileNameToContentsMap.Add(
*FString::Printf(TEXT("UniformBuffers/%s.usf"),It.Key()),
It.Value().Declaration[Platform]
@@ -389,7 +389,7 @@ void FVertexFactoryType::AddReferencedUniformBufferIncludes(FShaderCompilerEnvir
for (TMap<const TCHAR*,FCachedUniformBufferDeclaration>::TConstIterator It(ReferencedUniformBufferStructsCache); It; ++It)
{
check(It.Value().Declaration[Platform].Len() > 0);
UniformBufferIncludes += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"")LINE_TERMINATOR, It.Key());
UniformBufferIncludes += FString::Printf(TEXT("#include \"UniformBuffers/%s.usf\"") LINE_TERMINATOR, It.Key());
OutEnvironment.IncludeFileNameToContentsMap.Add(
*FString::Printf(TEXT("UniformBuffers/%s.usf"),It.Key()),
It.Value().Declaration[Platform]