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

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

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,10 +365,6 @@ namespace UnrealBuildTool
{
foreach (ProjectTarget Target in Project.ProjectTargets)
{
TargetRules.CPPEnvironmentConfiguration CppEnvironment = new TargetRules.CPPEnvironmentConfiguration(Target.TargetRules);
TargetRules.LinkEnvironmentConfiguration LinkEnvironment = new TargetRules.LinkEnvironmentConfiguration(Target.TargetRules);
Target.TargetRules.SetupGlobalEnvironment(new TargetInfo(new ReadOnlyTargetRules(Target.TargetRules)), ref LinkEnvironment, ref CppEnvironment);
Array Configs = Enum.GetValues(typeof(UnrealTargetConfiguration));
List<UnrealTargetPlatform> Platforms = new List<UnrealTargetPlatform>(UEBuildTarget.GetSupportedPlatforms(Target.TargetRules));
@@ -395,7 +391,7 @@ namespace UnrealBuildTool
Config = Config,
UProjectFile = Target.UnrealProjectFilePath,
OutputType = ProjectData.EOutputType.Exe,
OutputFile = GetExecutableFilename(Project, Target, Platform, Config, LinkEnvironment),
OutputFile = GetExecutableFilename(Project, Target, Platform, Config),
CSharpInfo = null
});
}
@@ -863,7 +859,7 @@ namespace UnrealBuildTool
return Result;
}
private FileReference GetExecutableFilename(ProjectFile Project, ProjectTarget Target, UnrealTargetPlatform Platform, UnrealTargetConfiguration Configuration, TargetRules.LinkEnvironmentConfiguration LinkEnvironment)
private FileReference GetExecutableFilename(ProjectFile Project, ProjectTarget Target, UnrealTargetPlatform Platform, UnrealTargetConfiguration Configuration)
{
TargetRules TargetRulesObject = Target.TargetRules;
FileReference TargetFilePath = Target.TargetFilePath;
@@ -935,7 +931,7 @@ namespace UnrealBuildTool
ExecutableFilename += ".app/Contents/MacOS/" + Path.GetFileName(ExecutableFilename);
}
return FileReference.MakeFromNormalizedFullPath(ExecutableFilename);
return new FileReference(ExecutableFilename);
}
private void WriteNativeLaunchConfig(ProjectData.Project InProject, JsonFile OutFile)
@@ -970,11 +966,6 @@ namespace UnrealBuildTool
OutFile.AddUnnamedField(InProject.Name);
}
}
if (BuildProduct.Config == UnrealTargetConfiguration.Debug || BuildProduct.Config == UnrealTargetConfiguration.DebugGame)
{
OutFile.AddUnnamedField("-debug");
}
}
}