Various improvements to building nethost
This commit is contained in:
@@ -309,7 +309,7 @@ namespace Flax.Build
|
||||
// Peek class library folder
|
||||
var coreLibPaths = Directory.GetFiles(aotAssembliesPath, "System.Private.CoreLib.dll", SearchOption.AllDirectories);
|
||||
if (coreLibPaths.Length != 1)
|
||||
throw new Exception("Invalid C# class library setup in " + aotAssembliesPath);
|
||||
throw new Exception($"Invalid C# class library setup in '{aotAssembliesPath}' (missing C# dll files)");
|
||||
var dotnetLibPath = Utilities.NormalizePath(Path.GetDirectoryName(coreLibPaths[0]));
|
||||
Log.Info("Class library found in: " + dotnetLibPath);
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ namespace Flax.Deps.Dependencies
|
||||
return new[]
|
||||
{
|
||||
TargetPlatform.PS4,
|
||||
TargetPlatform.Switch,
|
||||
};
|
||||
case TargetPlatform.Linux:
|
||||
return new[]
|
||||
@@ -254,7 +255,8 @@ namespace Flax.Deps.Dependencies
|
||||
Utilities.Run("cmake", "--version", null, null, Utilities.RunOptions.ThrowExceptionOnError);
|
||||
|
||||
// Get the source
|
||||
CloneGitRepo(root, "https://github.com/FlaxEngine/dotnet-runtime.git", "flax-master", null, true);
|
||||
CloneGitRepo(root, "https://github.com/FlaxEngine/dotnet-runtime.git", null, null, true);
|
||||
GitCheckout(root, "flax-master");
|
||||
SetupDirectory(Path.Combine(root, "src", "external"), false);
|
||||
|
||||
/*
|
||||
@@ -285,6 +287,9 @@ namespace Flax.Deps.Dependencies
|
||||
case TargetPlatform.Android:
|
||||
Build(options, platform, TargetArchitecture.ARM64);
|
||||
break;
|
||||
case TargetPlatform.Switch:
|
||||
Build(options, platform, TargetArchitecture.ARM64);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -140,11 +140,8 @@ namespace Flax.Deps
|
||||
if (submodules)
|
||||
Utilities.Run("git", "submodule update --init --recursive", null, null, Utilities.RunOptions.DefaultTool);
|
||||
}
|
||||
|
||||
if (commit != null)
|
||||
{
|
||||
Utilities.Run("git", string.Format("reset --hard {0}", commit), null, null, Utilities.RunOptions.DefaultTool);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user