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

Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)

Browse Source 
#rb none
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6631504 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748759 by ben marsh in Dev-Anim branch]
This commit is contained in:
ben marsh
2019-05-31 18:06:13 -04:00
parent 6ebb2a19d0
commit 83bd3cd7c6
599 changed files with 25292 additions and 8427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioCode/VSCodeProjectFileGenerator.cs
View File

@@ -410,7 +410,7 @@ namespace UnrealBuildTool
if (HostPlatform == UnrealTargetPlatform.Win64)
{
RawIncludes.AddRange(VCToolChain.GetVCIncludePaths(CppPlatform.Win64, WindowsPlatform.GetDefaultCompiler(null), null).Trim(';').Split(';'));
RawIncludes.AddRange(VCToolChain.GetVCIncludePaths(UnrealTargetPlatform.Win64, WindowsPlatform.GetDefaultCompiler(null), null).Trim(';').Split(';'));
}
else
{
@@ -436,7 +436,7 @@ namespace UnrealBuildTool
}
}
foreach (string Definition in Project.IntelliSensePreprocessorDefinitions)
{
string Processed = Definition.Replace("\"", "\\\"");
@@ -1000,22 +1000,13 @@ namespace UnrealBuildTool
{
OutFile.AddField("stopAtEntry", false);
OutFile.AddField("externalConsole", true);
OutFile.AddField("type", "cppvsdbg");
OutFile.AddField("visualizerFile", MakeUnquotedPathString(FileReference.Combine(UE4ProjectRoot, "Engine", "Extras", "VisualStudioDebugging", "UE4.natvis"), EPathType.Absolute));
}
switch (HostPlatform)
else
{
case UnrealTargetPlatform.Win64:
{
OutFile.AddField("type", "cppvsdbg");
OutFile.AddField("visualizerFile", MakeUnquotedPathString(FileReference.Combine(UE4ProjectRoot, "Engine", "Extras", "VisualStudioDebugging", "UE4.natvis"), EPathType.Absolute));
break;
}
default:
{
OutFile.AddField("type", "lldb");
break;
}
OutFile.AddField("type", "lldb");
}
}
OutFile.EndObject();