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

Add .NET 7 improvements for platforms

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-06 13:07:45 +02:00
parent f4e62afe8a
commit 92520a3c17
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Configuration.cs
View File

@@ -256,8 +256,6 @@ namespace Flax.Build
public static bool WithCSharp(NativeCpp.BuildOptions options)
{
if (options.Platform.Target == TargetPlatform.PS5)
return false; // TODO: mono for ps5
return UseCSharp || options.Target.IsEditor;
}

11
Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs
View File

@@ -230,8 +230,12 @@ namespace Flax.Deps.Dependencies
// TODO: shared/Microsoft.NETCore.App/<version>/System.IO.Compression.Native.dll
if (runtimeFlavor == "Mono")
{
// TODO: implement automatic deployment based on the setup:
// PS4 outputs mono into artifacts\obj\mono\PS4.x64.Release\out
// PS4 output AOT compiler into artifacts/obj/mono/PS4.x64.Release/cross/out/bin/mono-aot-cross.exe
// PS4 outputs native libs into artifacts\bin\native\net7.0-PS4-Release-x64\lib
// PS4 outputs System.Private.CoreLib lib into artifacts\bin\mono\PS4.x64.Release
// PS4 outputs C# libs into artifacts\bin\mono\PS4.x64.Release\cross\ps4-x64
// PS4 outputs AOT compiler into artifacts\bin\mono\PS4.x64.Release\cross\ps4-x64
Utilities.DirectoryCopy(Path.Combine(unpackTemp, "runtimes", hostRuntimeName, "native"), Path.Combine(dstDotnet, "native"), true, true);
Utilities.FileDelete(Path.Combine(dstDotnet, "native", privateCorelib));
}
@@ -275,16 +279,13 @@ namespace Flax.Deps.Dependencies
switch (platform)
{
case TargetPlatform.PS4:
{
case TargetPlatform.PS5:
Build(options, platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.Android:
{
Build(options, platform, TargetArchitecture.ARM64);
break;
}
}
}
// Copy license