Merging //UE4/Release-4.19 to Release-Staging-4.19 (//UE4/Release-Staging-4.19) @ 3833288

#rb none
#jira no
#rnx

[CL 3833418 by Marc Audy in Staging-4.19 branch]
This commit is contained in:
Marc Audy
2018-01-11 16:07:16 -05:00
parent 13d012685f
commit 994a524453
281 changed files with 11027 additions and 14544 deletions
@@ -93,9 +93,9 @@ public class MeshUtilities : ModuleRules
PublicIncludePaths.Add(SDKDir + "include");
PublicLibraryPaths.Add(SDKDir + "lib");
PublicAdditionalLibraries.Add("embree.2.14.0.lib");
RuntimeDependencies.Add(new RuntimeDependency("$(EngineDir)/Binaries/Win64/embree.2.14.0.dll"));
RuntimeDependencies.Add(new RuntimeDependency("$(EngineDir)/Binaries/Win64/tbb.dll"));
RuntimeDependencies.Add(new RuntimeDependency("$(EngineDir)/Binaries/Win64/tbbmalloc.dll"));
RuntimeDependencies.Add("$(EngineDir)/Binaries/Win64/embree.2.14.0.dll");
RuntimeDependencies.Add("$(EngineDir)/Binaries/Win64/tbb.dll");
RuntimeDependencies.Add("$(EngineDir)/Binaries/Win64/tbbmalloc.dll");
PublicDefinitions.Add("USE_EMBREE=1");
}
else if (Target.Platform == UnrealTargetPlatform.Mac)