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

Check VS2026 toolset before trying to compile PhysX

Browse Source
This commit is contained in:
Ari Vuollet
2025-10-18 03:24:51 +03:00
parent 7e72e856e1
commit 7c38baaa54
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
View File

@@ -422,17 +422,22 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Windows: case TargetPlatform.Windows:
{ {
if (architecture == TargetArchitecture.x64 || architecture == TargetArchitecture.ARM64) if (architecture == TargetArchitecture.x64 || architecture == TargetArchitecture.ARM64)
{
if (WindowsPlatform.GetToolsets().Any(x => x.Key == WindowsPlatformToolset.v145))
{ {
try try
{ {
Build(options, architecture == TargetArchitecture.x64 ? "vc18win64" : "vc18win-arm64", platform, architecture); Build(options, architecture == TargetArchitecture.x64 ? "vc18win64" : "vc18win-arm64", platform, architecture);
} }
catch catch (Exception e)
{ {
Log.Verbose("Failed to generate VS2026 solution for PhysX, fallback to VS2022"); Log.Warning($"Failed to generate VS2026 solution for PhysX, fallback to VS2022: {e.Message}");
Build(options, architecture == TargetArchitecture.x64 ? "vc17win64" : "vc17win-arm64", platform, architecture); Build(options, architecture == TargetArchitecture.x64 ? "vc17win64" : "vc17win-arm64", platform, architecture);
} }
} }
else
Build(options, architecture == TargetArchitecture.x64 ? "vc17win64" : "vc17win-arm64", platform, architecture);
}
else else
throw new InvalidArchitectureException(architecture); throw new InvalidArchitectureException(architecture);
break; break;