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

Merge branch 'master' into 1.2

Browse Source 
# Conflicts:
#	Source/Engine/Platform/Network.h
This commit is contained in:
Wojtek Figat
2021-03-22 11:26:36 +01:00
parent de02131d0a 39a6d0d292
commit 40c537d114
116 changed files with 1782 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs
View File

@@ -243,9 +243,14 @@ namespace Flax.Build.Platforms
{
if (_toolsets != null)
return _toolsets;
var vsInstances = VisualStudioInstance.GetInstances();
_toolsets = new Dictionary<WindowsPlatformToolset, string>();
// Skip if running on non-Windows system
if (BuildTargetPlatform != TargetPlatform.Windows)
return _toolsets;
var vsInstances = VisualStudioInstance.GetInstances();
// Visual Studio 2015 - single instance
var vs2015 = vsInstances.FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2015);
if (vs2015 != null)