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

Codestyle fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-18 12:11:28 +02:00
parent 0ece806230
commit 79bf226fe1
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Scripting/BinaryModule.cpp
View File

@@ -1012,8 +1012,7 @@ void ManagedBinaryModule::InitType(MClass* mclass)
baseType.Module->TypeNameToTypeIndex.TryGet(baseClass->GetFullName(), *(int32*)&baseType.TypeIndex); baseType.Module->TypeNameToTypeIndex.TryGet(baseClass->GetFullName(), *(int32*)&baseType.TypeIndex);
// So we must special case this flow of a generic class of which its possible the generic base class is not // So we must special case this flow of a generic class of which its possible the generic base class is not in the same module
// in the same module
if (baseType.TypeIndex == -1 && baseClass->IsGeneric()) if (baseType.TypeIndex == -1 && baseClass->IsGeneric())
{ {
auto genericNameIndex = baseClass->GetFullName().FindLast('`'); auto genericNameIndex = baseClass->GetFullName().FindLast('`');

1
Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
View File

@@ -208,7 +208,6 @@ namespace Flax.Build
{ {
#if USE_NETCORE #if USE_NETCORE
dotnetPath = Path.Combine(dotnetSdk.RootPath, "dotnet"); dotnetPath = Path.Combine(dotnetSdk.RootPath, "dotnet");
cscPath = Path.Combine(dotnetSdk.RootPath, $"sdk/{dotnetSdk.VersionName}/Roslyn/bincore/csc.dll"); cscPath = Path.Combine(dotnetSdk.RootPath, $"sdk/{dotnetSdk.VersionName}/Roslyn/bincore/csc.dll");
referenceAssemblies = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/ref/net{runtimeVersionShort}/"); referenceAssemblies = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/ref/net{runtimeVersionShort}/");
referenceAnalyzers = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/analyzers/dotnet/cs/"); referenceAnalyzers = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/analyzers/dotnet/cs/");

5
Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
View File

@@ -213,11 +213,10 @@ namespace Flax.Build
if (string.IsNullOrEmpty(dotnetPath)) if (string.IsNullOrEmpty(dotnetPath))
dotnetPath = "/usr/local/share/dotnet/"; dotnetPath = "/usr/local/share/dotnet/";
// So there is not a real great way to do this but if the first thing in this list is x64 // Use x64 when cross-compiling from ARM64
// then lets assume we are building for it and thus should using that rid and that dotnet path
if (architecture == TargetArchitecture.ARM64 && (Configuration.BuildArchitectures != null && Configuration.BuildArchitectures[0] == TargetArchitecture.x64)) if (architecture == TargetArchitecture.ARM64 && (Configuration.BuildArchitectures != null && Configuration.BuildArchitectures[0] == TargetArchitecture.x64))
{ {
rid = $"osx-x64"; rid = "osx-x64";
dotnetPath = Path.Combine(dotnetPath, "x64"); dotnetPath = Path.Combine(dotnetPath, "x64");
architecture = TargetArchitecture.x64; architecture = TargetArchitecture.x64;
} }