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

Merge branch 'GoaLitiuM-vs2022v1710'

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-04 20:00:51 +01:00
parent 8e54a79470 285fef97a2
commit 44ce444932
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Tools/Flax.Build/Platforms/GDK/GDKPlatform.cs
View File

@@ -31,8 +31,11 @@ namespace Flax.Build.Platforms
var toolsets = GetToolsets();
if (!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v143))
!toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v144))
{
_hasRequiredSDKsInstalled = false;
}
}
}
}

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

@@ -45,8 +45,11 @@ namespace Flax.Build.Platforms
var toolsets = GetToolsets();
if (!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v143))
!toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v144))
{
_hasRequiredSDKsInstalled = false;
}
}
/// <inheritdoc />

3
Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatform.cs
View File

@@ -39,7 +39,8 @@ namespace Flax.Build.Platforms
if (!toolsets.ContainsKey(WindowsPlatformToolset.v140) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v143))
!toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
!toolsets.ContainsKey(WindowsPlatformToolset.v144))
{
Log.Warning("Missing MSVC toolset v140 or later (VS 2015 or later C++ build tools). Cannot build for Windows platform.");
_hasRequiredSDKsInstalled = false;

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

@@ -49,6 +49,11 @@ namespace Flax.Build.Platforms
/// Visual Studio 2022
/// </summary>
v143 = 143,
/// <summary>
/// Visual Studio 2022 (v17.10 and later)
/// </summary>
v144 = 144,
}
/// <summary>
@@ -240,6 +245,10 @@ namespace Flax.Build.Platforms
_toolsets[WindowsPlatformToolset.v142] = toolset;
else if (version.Major == 14 && version.Minor / 10 == 3)
_toolsets[WindowsPlatformToolset.v143] = toolset;
else if (version.Major == 14 && version.Minor / 10 == 4)
_toolsets[WindowsPlatformToolset.v144] = toolset;
else
Log.Warning("Found Unsupported MSVC toolset version: " + version);
}
}
}
@@ -424,6 +433,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformToolset.v141:
case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v143:
case WindowsPlatformToolset.v144:
{
/*
string crossCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x86", "cl.exe");
@@ -477,6 +487,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformToolset.v141:
case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v143:
case WindowsPlatformToolset.v144:
{
string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x64", "cl.exe");
if (File.Exists(nativeCompilerPath))

11
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
View File

@@ -90,7 +90,14 @@ namespace Flax.Build.Platforms
{
if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
{
toolsetVer = WindowsPlatformToolset.v143;
if (toolsets.Keys.Contains(WindowsPlatformToolset.v144))
{
toolsetVer = WindowsPlatformToolset.v144;
}
else
{
toolsetVer = WindowsPlatformToolset.v143;
}
}
else if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2019))
{
@@ -199,6 +206,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformToolset.v141:
case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v143:
case WindowsPlatformToolset.v144:
{
switch (Architecture)
{
@@ -378,6 +386,7 @@ namespace Flax.Build.Platforms
var vcToolChainDir = toolsets[Toolset];
switch (Toolset)
{
case WindowsPlatformToolset.v144:
case WindowsPlatformToolset.v143:
case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v141: return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references");