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

Change Mac platform impl to inherit from Unix base

Browse Source
This commit is contained in:
Wojtek Figat
2021-12-29 17:01:58 +01:00
parent 378ddc66c7
commit 0dbbdc9149
25 changed files with 105 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs
View File

@@ -71,13 +71,15 @@ namespace Flax.Build.Platforms
/// </summary>
/// <param name="platform">The platform.</param>
/// <param name="architecture">The target architecture.</param>
/// <param name="toolchainRoots">The root folder for the toolchains installation.</param>
/// <param name="toolchainRoots">The root folder for the toolchains installation. If null, then platform must specify tools paths manually.</param>
/// <param name="systemCompiler">The system compiler to use. Null if use toolset root.</param>
/// <param name="toolchainSubDir">The custom toolchain folder location in <paramref name="toolchainRoots"/> directory. If nul the architecture name will be used.</param>
protected UnixToolchain(UnixPlatform platform, TargetArchitecture architecture, string toolchainRoots, string systemCompiler, string toolchainSubDir = null)
protected UnixToolchain(UnixPlatform platform, TargetArchitecture architecture, string toolchainRoots = null, string systemCompiler = null, string toolchainSubDir = null)
: base(platform, architecture)
{
ArchitectureName = GetToolchainName(platform.Target, architecture);
if (toolchainRoots == null)
return;
// Build paths
if (systemCompiler != null)
@@ -198,6 +200,12 @@ namespace Flax.Build.Platforms
case TargetArchitecture.ARM64: return "aarch64-linux-android";
default: throw new InvalidArchitectureException(architecture);
}
case TargetPlatform.Mac:
switch (architecture)
{
case TargetArchitecture.x64: return "x86_64-apple-macos" + Configuration.MacOSXMinVer;
default: throw new InvalidArchitectureException(architecture);
}
default: throw new InvalidPlatformException(platform);
}
}