Compare commits
2 Commits
7e72e856e1
...
10541b8568
| Author | SHA1 | Date | |
|---|---|---|---|
| 10541b8568 | |||
| 7c38baaa54 |
@@ -423,15 +423,20 @@ namespace Flax.Deps.Dependencies
|
||||
{
|
||||
if (architecture == TargetArchitecture.x64 || architecture == TargetArchitecture.ARM64)
|
||||
{
|
||||
try
|
||||
if (WindowsPlatform.GetToolsets().Any(x => x.Key == WindowsPlatformToolset.v145))
|
||||
{
|
||||
Build(options, architecture == TargetArchitecture.x64 ? "vc18win64" : "vc18win-arm64", platform, architecture);
|
||||
try
|
||||
{
|
||||
Build(options, architecture == TargetArchitecture.x64 ? "vc18win64" : "vc18win-arm64", platform, architecture);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Warning($"Failed to generate VS2026 solution for PhysX, fallback to VS2022: {e.Message}");
|
||||
Build(options, architecture == TargetArchitecture.x64 ? "vc17win64" : "vc17win-arm64", platform, architecture);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Log.Verbose("Failed to generate VS2026 solution for PhysX, fallback to VS2022");
|
||||
else
|
||||
Build(options, architecture == TargetArchitecture.x64 ? "vc17win64" : "vc17win-arm64", platform, architecture);
|
||||
}
|
||||
}
|
||||
else
|
||||
throw new InvalidArchitectureException(architecture);
|
||||
|
||||
@@ -295,6 +295,7 @@ namespace Flax.Deps.Dependencies
|
||||
string ext;
|
||||
string oggConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
||||
string vorbisConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
||||
string liboggFilename = "libogg";
|
||||
Dictionary<string, string> envVars = new Dictionary<string, string>();
|
||||
(string, string)[] oggBinariesToCopy;
|
||||
Binary[] vorbisBinariesToCopy;
|
||||
@@ -306,6 +307,7 @@ namespace Flax.Deps.Dependencies
|
||||
oggConfig += " -DBUILD_SHARED_LIBS=OFF";
|
||||
vorbisConfig += " -DBUILD_SHARED_LIBS=OFF";
|
||||
ext = ".lib";
|
||||
liboggFilename = "ogg";
|
||||
break;
|
||||
case TargetPlatform.Linux:
|
||||
oggConfig += " -DCMAKE_POSITION_INDEPENDENT_CODE=ON";
|
||||
@@ -355,7 +357,7 @@ namespace Flax.Deps.Dependencies
|
||||
default: throw new InvalidPlatformException(platform);
|
||||
}
|
||||
|
||||
vorbisConfig += $" -DOGG_INCLUDE_DIR=\"{Path.Combine(installDir, "include")}\" -DOGG_LIBRARY=\"{Path.Combine(installDir, "lib", "libogg" + ext)}\"";
|
||||
vorbisConfig += $" -DOGG_INCLUDE_DIR=\"{Path.Combine(installDir, "include")}\" -DOGG_LIBRARY=\"{Path.Combine(installDir, "lib", liboggFilename + ext)}\"";
|
||||
|
||||
var binariesToCopy = new List<(string, string)>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user