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

Add basis universal and Web build support for macOS

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-26 10:47:52 +01:00
parent 35fb320ff0
commit 5ccc33719e
6 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Editor/Windows/GameCookerWindow.cs
View File

@@ -137,6 +137,7 @@ namespace FlaxEditor.Windows
case BuildPlatform.MacOSARM64:
case BuildPlatform.iOSARM64:
case BuildPlatform.AndroidARM64:
case BuildPlatform.Web:
IsSupported = true;
break;
default:

BIN
Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libbasisu_encoder.a LFS vendored Normal file
View File

Binary file not shown.

BIN
Source/Platforms/Mac/Binaries/ThirdParty/x64/libbasisu_encoder.a LFS vendored Normal file
View File

Binary file not shown.

1
Source/ThirdParty/basis_universal/basis_universal.Build.cs vendored
View File

@@ -18,6 +18,7 @@ public class basis_universal : EngineDepsModule
case TargetPlatform.Windows:
case TargetPlatform.Web:
case TargetPlatform.Linux:
case TargetPlatform.Mac:
return true;
default:
return false;

12
Source/Tools/Flax.Build/Deps/Dependencies/basis_universal.cs
View File

@@ -30,6 +30,11 @@ namespace Flax.Deps.Dependencies
{
TargetPlatform.Linux,
};
case TargetPlatform.Mac:
return new[]
{
TargetPlatform.Mac,
};
default:
return new TargetPlatform[0];
}
@@ -55,6 +60,12 @@ namespace Flax.Deps.Dependencies
{
TargetArchitecture.x64,
};
case TargetPlatform.Mac:
return new[]
{
TargetArchitecture.x64,
TargetArchitecture.ARM64,
};
default:
return new TargetArchitecture[0];
}
@@ -137,6 +148,7 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.Linux:
case TargetPlatform.Mac:
{
cmakeArgs = ".. " + cmakeArgs;
RunCmake(buildDir, platform, architecture, cmakeArgs);

3
Source/Tools/Flax.Build/Platforms/Web/WebToolchain.cs
View File

@@ -115,6 +115,8 @@ namespace Flax.Build.Platforms
private void AddSharedArgs(List<string> args, BuildOptions options, bool debugInformation, bool optimization)
{
args.Add("-Wno-experimental");
if (debugInformation)
args.Add("-g2");
else
@@ -289,7 +291,6 @@ namespace Flax.Build.Platforms
args.AddRange(options.LinkEnv.CustomArgs);
{
args.Add(string.Format("-o \"{0}\"", outputFilePath.Replace('\\', '/')));
args.Add("-Wno-experimental");
// Debug options
//args.Add("--minify=0");