Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)

#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-06-23 18:40:00 -04:00
parent a54c560436
commit 11f5b21210
9390 changed files with 453099 additions and 425504 deletions

View File

@@ -868,14 +868,14 @@ public:
FString DLLPath;
#if PLATFORM_WINDOWS
#if PLATFORM_64BITS
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/IntelISPCTexComp/Win64-Release/ispc_texcomp.dll");
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/Intel/ISPCTexComp/Win64-Release/ispc_texcomp.dll");
#else //32-bit platform
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/IntelISPCTexComp/Win32-Release/ispc_texcomp.dll");
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/Intel/ISPCTexComp/Win32-Release/ispc_texcomp.dll");
#endif
#elif PLATFORM_MAC
DLLPath = TEXT("libispc_texcomp.dylib");
#elif PLATFORM_LINUX
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/IntelISPCTexComp/Linux64-Release/libispc_texcomp.so");
DLLPath = FPaths::EngineDir() / TEXT("Binaries/ThirdParty/Intel/ISPCTexComp/Linux64-Release/libispc_texcomp.so");
#endif
if (DLLPath.Len() > 0)