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

Merge branch 'msvc_v140_arm64_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-msvc_v140_arm64_fix

Browse Source
This commit is contained in:
Wojtek Figat
2024-09-25 20:34:49 +02:00
parent b70e65acb4 d580667b97
commit e17c68a5a0
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Tools/Flax.Build/Build/Builder.Projects.cs
View File

@@ -50,6 +50,9 @@ namespace Flax.Build
var platform = Platform.BuildPlatform;
var architecture = TargetArchitecture.AnyCPU;
var architectureName = "AnyCPU";
if (!platform.CanBuildArchitecture(architecture))
continue;
var toolchain = platform.TryGetToolchain(architecture);
var configuration = TargetConfiguration.Debug;

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

@@ -433,7 +433,12 @@ namespace Flax.Build.Platforms
{
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");
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));
return null;
}
else
else if (hostArchitecture == TargetArchitecture.x86)
{
string compilerPath = Path.Combine(vcToolChainDir, "bin", "cl.exe");
if (File.Exists(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;
}
}