diff --git a/Source/ThirdParty/nethost/nethost.Build.cs b/Source/ThirdParty/nethost/nethost.Build.cs index 69d96d637..2910e401d 100644 --- a/Source/ThirdParty/nethost/nethost.Build.cs +++ b/Source/ThirdParty/nethost/nethost.Build.cs @@ -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")); diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs index 0a8181903..4d6a1aab6 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs @@ -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: