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

UBT: Remove code to add the -Monolithic option when generating intellisense data. This only exists to prevent intellisense errors because the DLLEXPORT and DLLIMPORT macros are mismatched for the project containing all modules; we can achieve this by explicitly modifying the macros instead.

Browse Source 
#rb none
#rnx

[CL 4686059 by Ben Marsh in Dev-Build branch]
This commit is contained in:
Ben Marsh
2019-01-07 15:09:52 -05:00
parent d3e9699e4d
commit 6bef1a9def
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/Project.cs
View File

@@ -291,9 +291,10 @@ namespace UnrealBuildTool
/// <param name="NewPreprocessorDefinitions">List of preprocessor definitons to add</param>
public void AddIntelliSensePreprocessorDefinitions(List<string> NewPreprocessorDefinitions)
{
foreach (string CurDef in NewPreprocessorDefinitions)
foreach (string NewPreprocessorDefinition in NewPreprocessorDefinitions)
{
// Don't add definitions and value combinations that have already been added for this project
string CurDef = NewPreprocessorDefinition;
if (KnownIntelliSensePreprocessorDefinitions.Add(CurDef))
{
// Go ahead and check to see if the definition already exists, but the value is different
@@ -301,6 +302,14 @@ namespace UnrealBuildTool
string Def, Value;
SplitDefinitionAndValue(CurDef, out Def, out Value);
// Ignore any API macros being import/export; we'll assume they're valid across the whole project
if(Def.EndsWith("_API", StringComparison.Ordinal))
{
CurDef = Def + "=";
Value = "";
}
for (int DefineIndex = 0; DefineIndex < IntelliSensePreprocessorDefinitions.Count; ++DefineIndex)
{
string ExistingDef, ExistingValue;

5
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs
View File

@@ -1693,11 +1693,6 @@ namespace UnrealBuildTool
{
NewArguments.Add("-precompile");
}
if (CurTarget.TargetRules.Type == TargetType.Editor && CurTarget.TargetRules.BuildEnvironment != TargetBuildEnvironment.Unique)
{
NewArguments.Add("-SharedBuildEnvironment"); // Force the shared build environment, even though we have -Monolithic
}
NewArguments.Add("-Monolithic"); // Don't want any _API macros to be DLLIMPORT; this will cause Intellisense errors in the file that they are defined.
NewArguments.AddRange(Arguments);
try