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

Fix packaged editor usage

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-16 19:00:15 +01:00
parent 4dbc770d75
commit 5cad37fa50
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs
View File

@@ -20,6 +20,13 @@ namespace Flax.Build.Platforms
/// </summary> /// </summary>
public UWPPlatform() public UWPPlatform()
{ {
// Skip if running on non-Windows system
if (Platform.BuildTargetPlatform != TargetPlatform.Windows)
{
_hasRequiredSDKsInstalled = false;
return;
}
// Visual Studio 2017+ supported only // Visual Studio 2017+ supported only
var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2017 || x.Version == VisualStudioVersion.VisualStudio2019); var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2017 || x.Version == VisualStudioVersion.VisualStudio2019);
if (visualStudio == null) if (visualStudio == null)

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

@@ -243,9 +243,14 @@ namespace Flax.Build.Platforms
{ {
if (_toolsets != null) if (_toolsets != null)
return _toolsets; return _toolsets;
var vsInstances = VisualStudioInstance.GetInstances();
_toolsets = new Dictionary<WindowsPlatformToolset, string>(); _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 // Visual Studio 2015 - single instance
var vs2015 = vsInstances.FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2015); var vs2015 = vsInstances.FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2015);
if (vs2015 != null) if (vs2015 != null)

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

@@ -97,9 +97,13 @@ namespace Flax.Build.Projects.VisualStudio
{ {
_installDirs = new List<VisualStudioInstance>(); _installDirs = new List<VisualStudioInstance>();
// Skip if running on non-Windows system
if (Platform.BuildTargetPlatform != TargetPlatform.Windows)
return _installDirs;
if (Environment.OSVersion.Platform == PlatformID.Win32NT) if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{ {
// Visual Studio 2017-2020 // Visual Studio 2017-2019
List<VisualStudioInstance> preReleaseInstallDirs = null; List<VisualStudioInstance> preReleaseInstallDirs = null;
try try
{ {