Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

#rb none
#rnx

[CL 4341874 by Ryan Gerleve in Dev-Networking branch]
This commit is contained in:
Ryan Gerleve
2018-09-04 14:32:41 -04:00
parent a351fe5b0d
commit e7612e89b2
4103 changed files with 202245 additions and 70241 deletions

View File

@@ -90,14 +90,13 @@ bool FHTML5TargetPlatform::IsSdkInstalled(bool bProjectHasCode, FString& OutDocu
{
// When the EMSDK environment variable is used, locate Emscripten SDK from the directory
// pointed to by that variable, instead of using a prepackaged SDK.
TCHAR EmsdkDirectory[1024] = { 0 };
FPlatformMisc::GetEnvironmentVariable(TEXT("EMSDK"), EmsdkDirectory, 1024);
if (EmsdkDirectory[0] != 0)
FString EmsdkDirectory = FPlatformMisc::GetEnvironmentVariable(TEXT("EMSDK"));
if (EmsdkDirectory.Len() > 0)
{
bool Exists = IFileManager::Get().DirectoryExists(EmsdkDirectory);
bool Exists = IFileManager::Get().DirectoryExists(*EmsdkDirectory);
if (!Exists)
{
UE_LOG(LogTemp, Display, TEXT("Environment variable EMSDK is set to \"%s\", but that directory does not exist!"), EmsdkDirectory);
UE_LOG(LogTemp, Display, TEXT("Environment variable EMSDK is set to \"%s\", but that directory does not exist!"), *EmsdkDirectory);
}
return Exists;
}