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

Fixes for Xbox with Mono AOT

Browse Source
This commit is contained in:
Wojtek Figat
2025-11-16 14:50:22 -08:00
parent 4aba0153f8
commit 371a16e37b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ public class nethost : ThirdPartyModule
case TargetPlatform.XboxScarlett:
options.OutputFiles.Add(Path.Combine(hostRuntime.Path, "monosgen-2.0.lib"));
options.OutputFiles.Add(Path.Combine(hostRuntime.Path, "mono-profiler-aot.lib"));
options.OutputFiles.Add(Path.Combine(hostRuntime.Path, "System.Globalization.Native-Static.lib"));
break;
case TargetPlatform.Linux:
options.OutputFiles.Add(Path.Combine(hostRuntime.Path, "libnethost.a"));

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

@@ -93,6 +93,7 @@ namespace Flax.Deps.Dependencies
defines += targetPlatform == TargetPlatform.XboxScarlett ? "-D_GAMING_XBOX_SCARLETT=1" : "-D_GAMING_XBOX_XBOXONE=1";
defines += "-DDISABLE_EXECUTABLES=1-DDISABLE_SHARED_LIBS=1";
buildArgs = $" -subset mono+libs -cmakeargs \"{defines}\" /p:FeaturePerfTracing=false /p:FeatureWin32Registry=false /p:FeatureCominteropApartmentSupport=false /p:FeatureManagedEtw=false /p:FeatureManagedEtwChannels=false /p:FeatureEtw=false /p:ApiCompatValidateAssemblies=false";
envVars.Add("_GAMING_XBOX", "1");
break;
case TargetPlatform.Linux:
os = "linux";
@@ -240,20 +241,28 @@ namespace Flax.Deps.Dependencies
switch (targetPlatform)
{
case TargetPlatform.Windows:
libs1 = new[]
{
"lib/coreclr.dll",
"lib/coreclr.import.lib",
};
libs2 = new[]
{
"System.Globalization.Native.dll",
"System.IO.Compression.Native.dll",
};
break;
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett:
libs1 = new[]
{
// When using shared library:
//"lib/coreclr.dll",
//"lib/coreclr.import.lib",
// When using static library:
"lib/monosgen-2.0.lib",
"lib/mono-profiler-aot.lib",
};
libs2 = new string[]
libs2 = new[]
{
"lib/System.Globalization.Native-Static.lib",
"lib/System.IO.Compression.Native-Static.lib",
};
break;
default: