GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into linux-editor

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
This commit is contained in:
Wojtek Figat
2021-02-23 22:29:07 +01:00
parent 747a9bcb98 87a290b45c
commit cf3ac7a26e
147 changed files with 1740 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
View File

@@ -133,6 +133,8 @@ namespace Flax.Build.Projects.VisualStudio
// Per configuration options
var buildToolPath = Utilities.MakePathRelativeTo(typeof(Builder).Assembly.Location, projectDirectory);
var preprocessorDefinitions = new HashSet<string>();
var includePaths = new HashSet<string>();
foreach (var configuration in project.Configurations)
{
var platform = Platform.GetPlatform(configuration.Platform);
@@ -140,11 +142,11 @@ namespace Flax.Build.Projects.VisualStudio
var target = configuration.Target;
var targetBuildOptions = configuration.TargetBuildOptions;
var preprocessorDefinitions = new HashSet<string>();
preprocessorDefinitions.Clear();
foreach (var e in targetBuildOptions.CompileEnv.PreprocessorDefinitions)
preprocessorDefinitions.Add(e);
var includePaths = new HashSet<string>();
includePaths.Clear();
foreach (var e in targetBuildOptions.CompileEnv.IncludePaths)
includePaths.Add(e);