kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set HXCPP_ARM64 by default when building on Apple Silicon Mac

Browse Source
This commit is contained in:
tobil4sk
2024-01-27 13:20:22 +00:00
parent d05f10b15f
commit f06c78e82a
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/platforms/MacPlatform.hx
View File

@@ -34,6 +34,7 @@ class MacPlatform extends PlatformTarget
private var executableDirectory:String;
private var executablePath:String;
private var is64:Bool;
private var isArm64:Bool;
private var targetType:String;
public function new(command:String, _project:HXProject, targetFlags:Map<String, String>)
@@ -103,6 +104,8 @@ class MacPlatform extends PlatformTarget
defaults.architectures = [X86];
case X64:
defaults.architectures = [X64];
case ARM64:
defaults.architectures = [ARM64];
default:
defaults.architectures = [];
}
@@ -128,6 +131,10 @@ class MacPlatform extends PlatformTarget
{
is64 = true;
}
if (architecture == Architecture.ARM64)
{
isArm64 = true;
}
}
if (project.targetFlags.exists("neko") || project.target != cast System.hostPlatform)
@@ -270,6 +277,12 @@ class MacPlatform extends PlatformTarget
haxeArgs.push("HXCPP_M64");
flags.push("-DHXCPP_M64");
}
else if (isArm64)
{
haxeArgs.push("-D");
haxeArgs.push("HXCPP_ARM64");
flags.push("-DHXCPP_ARM64");
}
if (!project.targetFlags.exists("static"))
{
@@ -379,11 +392,16 @@ class MacPlatform extends PlatformTarget
}
else
{
if (!targetFlags.exists("32") && (command == "rebuild" || System.hostArchitecture == X64))
if (!targetFlags.exists("32") && System.hostArchitecture == X64)
{
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64"]);
}
if (!targetFlags.exists("32") && System.hostArchitecture == ARM64)
{
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_ARM64"]);
}
if (!targetFlags.exists("64") && (targetFlags.exists("32") || System.hostArchitecture == X86))
{
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M32"]);