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

Merge remote-tracking branch 'origin/1.12' into 1.12

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-06 17:35:22 +01:00
parent 5942209114 26838609db
commit 438a9e4c3d
6 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Source/Platforms/Linux/Binaries/ThirdParty/x64/libSDL3.a LFS vendored Normal file
View File

Binary file not shown.

BIN
Source/Platforms/Linux/Binaries/ThirdParty/x64/libbasisu_encoder.a LFS vendored Normal file
View File

Binary file not shown.

BIN
Source/Platforms/Linux/Binaries/ThirdParty/x64/libportal.a LFS vendored Normal file
View File

Binary file not shown.

0
Source/Platforms/Linux/Binaries/ThirdParty/x64/tint vendored Normal file → Executable file
View File

1
Source/ThirdParty/basis_universal/basis_universal.Build.cs vendored
View File

@@ -17,6 +17,7 @@ public class basis_universal : EngineDepsModule
{
case TargetPlatform.Windows:
case TargetPlatform.Web:
case TargetPlatform.Linux:
return true;
default:
return false;

18
Source/Tools/Flax.Build/Deps/Dependencies/basis_universal.cs
View File

@@ -25,6 +25,11 @@ namespace Flax.Deps.Dependencies
TargetPlatform.Windows,
TargetPlatform.Web,
};
case TargetPlatform.Linux:
return new[]
{
TargetPlatform.Linux,
};
default:
return new TargetPlatform[0];
}
@@ -45,6 +50,11 @@ namespace Flax.Deps.Dependencies
TargetArchitecture.x64,
TargetArchitecture.ARM64,
};
case TargetPlatform.Linux:
return new[]
{
TargetArchitecture.x64,
};
default:
return new TargetArchitecture[0];
}
@@ -124,6 +134,14 @@ namespace Flax.Deps.Dependencies
CopyLib(platform, buildDir, depsFolder, "basisu_encoder");
break;
}
case TargetPlatform.Linux:
{
cmakeArgs = ".. " + cmakeArgs;
RunCmake(buildDir, platform, architecture, cmakeArgs);
BuildCmake(buildDir, configuration, options:Utilities.RunOptions.ConsoleLogOutput);
CopyLib(platform, buildDir, depsFolder, "basisu_encoder");
break;
}
}
}
}