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

Fix ARM64 compiler support detection with MSVC v140 toolset

Browse Source
This commit is contained in:
Ari Vuollet
2024-09-25 17:38:29 +03:00
parent 9daddccbed
commit 301bf41fab
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,7 +433,12 @@ namespace Flax.Build.Platforms
{ {
case WindowsPlatformToolset.v140: case WindowsPlatformToolset.v140:
{ {
if (hostArchitecture != TargetArchitecture.x86) if (architecture == TargetArchitecture.ARM64)
{
Log.Verbose(string.Format("Unsupported {0} architecture for v140 toolset", hostArchitecture.ToString()));
return null;
}
else if (hostArchitecture == TargetArchitecture.x64)
{ {
string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "amd64", "cl.exe"); string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "amd64", "cl.exe");
if (File.Exists(nativeCompilerPath)) if (File.Exists(nativeCompilerPath))
@@ -446,12 +451,17 @@ namespace Flax.Build.Platforms
Log.Verbose(string.Format("No {0} host compiler toolchain found in {1} or {2}", hostArchitecture.ToString(), nativeCompilerPath, crossCompilerPath)); Log.Verbose(string.Format("No {0} host compiler toolchain found in {1} or {2}", hostArchitecture.ToString(), nativeCompilerPath, crossCompilerPath));
return null; return null;
} }
else else if (hostArchitecture == TargetArchitecture.x86)
{ {
string compilerPath = Path.Combine(vcToolChainDir, "bin", "cl.exe"); string compilerPath = Path.Combine(vcToolChainDir, "bin", "cl.exe");
if (File.Exists(compilerPath)) if (File.Exists(compilerPath))
return Path.GetDirectoryName(compilerPath); return Path.GetDirectoryName(compilerPath);
Log.Verbose(string.Format("No {0} host compiler toolchain found in {1}", hostArchitecture.ToString())); Log.Verbose(string.Format("No {0} host compiler toolchain found in {1}", hostArchitecture.ToString(), compilerPath));
return null;
}
else
{
Log.Verbose(string.Format("Unsupported {0} host compiler for v140 toolset", hostArchitecture.ToString()));
return null; return null;
} }
} }