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

#rb None
#jira None

[CL 5826383 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2019-04-11 06:05:49 -04:00
parent 67ffa1bcc7
commit 8d3bbb48b2
901 changed files with 41141 additions and 25763 deletions

View File

@@ -6,6 +6,8 @@
#include "External/LC_FileUtil.h"
#include "External/LC_AppSettings.h"
#include "External/LC_ServerCommandThread.h"
#include "External/LC_Compiler.h"
#include "External/LC_Environment.h"
FLiveCodingServer* GLiveCodingServer = nullptr;
@@ -47,10 +49,16 @@ void FLiveCodingServer::Stop()
ProcessGroupName.clear();
}
void FLiveCodingServer::SetLinkerPath(const wchar_t* LinkerPath)
void FLiveCodingServer::SetLinkerPath(const wchar_t* LinkerPath, const TMap<FString, FString>& LinkerEnvironment)
{
appSettings::g_linkerPath->SetValueWithoutSaving(LinkerPath);
appSettings::UpdateLinkerPathCache();
if (LinkerEnvironment.Num() > 0)
{
environment::Block* block = environment::CreateBlockFromMap(LinkerEnvironment);
compiler::AddEnvironmentToCache(LinkerPath, block);
}
}
ILiveCodingServer::FBringToFrontDelegate& FLiveCodingServer::GetBringToFrontDelegate()