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

Progress for dotnet7 support on Linux

Browse Source
This commit is contained in:
Wojtek Figat
2023-01-08 15:05:09 +01:00
parent 8896ebadda
commit 5ec9716eac
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Development/Scripts/Linux/CallBuildTool.sh
View File

@@ -14,5 +14,4 @@ dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.cspr
dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /target:Build /property:SelfContained=False /property:RuntimeIdentifiers=linux-x64 dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /target:Build /property:SelfContained=False /property:RuntimeIdentifiers=linux-x64
# Run the build tool using the provided arguments. # Run the build tool using the provided arguments.
#mono --debug --debugger-agent=transport=dt_socket,server=y,address=127.0.0.1:55555 Binaries/Tools/Flax.Build.exe "$@"
Binaries/Tools/Flax.Build "$@" Binaries/Tools/Flax.Build "$@"

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

@@ -178,7 +178,7 @@ namespace Flax.Build
} }
sw.Stop(); sw.Stop();
Log.Info("Assembler time: " + sw.Elapsed.TotalSeconds.ToString() + "s"); Log.Verbose("Assembler time: " + sw.Elapsed.TotalSeconds.ToString() + "s");
return compiledAssembly; return compiledAssembly;
} }
} }

7
Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
View File

@@ -214,10 +214,9 @@ namespace Flax.Build.Projects.VisualStudioCode
} }
case TargetPlatform.Linux: case TargetPlatform.Linux:
{ {
json.AddField("command", Path.Combine(Globals.EngineRoot, "Source/Platforms/Editor/Linux/Mono/bin/mono")); json.AddField("command", Path.ChangeExtension(buildToolPath, null));
json.BeginArray("args"); json.BeginArray("args");
{ {
json.AddUnnamedField(buildToolPath);
json.AddUnnamedField("--build"); json.AddUnnamedField("--build");
json.AddUnnamedField("--log"); json.AddUnnamedField("--log");
json.AddUnnamedField("--mutex"); json.AddUnnamedField("--mutex");
@@ -242,11 +241,9 @@ namespace Flax.Build.Projects.VisualStudioCode
} }
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
VisualStudioCodeInstance.GetInstance(); json.AddField("command", buildToolPath);
json.AddField("command", "mono"); // TODO: use bundled mono
json.BeginArray("args"); json.BeginArray("args");
{ {
json.AddUnnamedField(buildToolPath);
json.AddUnnamedField("--build"); json.AddUnnamedField("--build");
json.AddUnnamedField("--log"); json.AddUnnamedField("--log");
json.AddUnnamedField("--mutex"); json.AddUnnamedField("--mutex");