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

Migrate Linux build from mono to to dotnet7

Browse Source
This commit is contained in:
Wojtek Figat
2023-03-20 19:25:00 +01:00
parent d719c534d4
commit 154076a5d0
213 changed files with 2 additions and 25774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp
View File

@@ -267,7 +267,7 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
}
}
// Generate Mono files hash id used to skip deploying Mono files if already extracted on device (Mono cannot access files packed into .apk via unix file access)
// Generate Dotnet files hash id used to skip deploying Dotnet files if already extracted on device (Dotnet cannot access files packed into .apk via unix file access)
File::WriteAllText(assetsPath / TEXT("hash.txt"), Guid::New().ToString(), Encoding::ANSI);
// TODO: expose event to inject custom gradle and manifest options or custom binaries into app

2
Source/Editor/Cooker/PlatformTools.h
View File

@@ -160,8 +160,6 @@ public:
AotConfig(CookingData& data)
{
Platform::GetEnvironmentVariables(EnvVars);
EnvVars[TEXT("MONO_PATH")] = data.DataOutputPath / TEXT("Mono/lib/mono/4.5");
AssembliesSearchDirs.Add(data.DataOutputPath / TEXT("Mono/lib/mono/4.5"));
}
};

2
Source/Editor/Cooker/Steps/DeployDataStep.cpp
View File

@@ -68,7 +68,7 @@ bool DeployDataStep::Perform(CookingData& data)
if (FileSystem::DirectoryExists(srcDotnet))
{
// Use prebuilt .Net installation for that platform
if (FileSystem::CopyDirectory(dstMono, srcDotnet, true))
if (FileSystem::CopyDirectory(dstDotnet, srcDotnet, true))
{
data.Error(TEXT("Failed to copy .Net runtime data files."));
return true;