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

Merge pull request #1752 from tobil4sk/fix/mac-HXCPP_ARM64

Browse Source 
Set HXCPP_ARM64 by default when building on Apple Silicon Mac
This commit is contained in:
player-03
2024-02-03 22:23:24 -05:00
committed by GitHub
parent 3cbafc4622 560ad5a6ba
commit 6fe43ea1e4
1 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
tools/platforms/MacPlatform.hx
View File

@@ -33,9 +33,11 @@ class MacPlatform extends PlatformTarget
private var contentDirectory:String; private var contentDirectory:String;
private var executableDirectory:String; private var executableDirectory:String;
private var executablePath:String; private var executablePath:String;
private var is64:Bool; private var targetArchitecture:Architecture;
private var targetType:String; private var targetType:String;
private var dirSuffix(get, never):String;
public function new(command:String, _project:HXProject, targetFlags:Map<String, String>) public function new(command:String, _project:HXProject, targetFlags:Map<String, String>)
{ {
super(command, _project, targetFlags); super(command, _project, targetFlags);
@@ -93,20 +95,6 @@ class MacPlatform extends PlatformTarget
title: "" title: ""
}; };
switch (System.hostArchitecture)
{
case ARMV6:
defaults.architectures = [ARMV6];
case ARMV7:
defaults.architectures = [ARMV7];
case X86:
defaults.architectures = [X86];
case X64:
defaults.architectures = [X64];
default:
defaults.architectures = [];
}
defaults.window.allowHighDPI = false; defaults.window.allowHighDPI = false;
for (i in 1...project.windows.length) for (i in 1...project.windows.length)
@@ -122,11 +110,13 @@ class MacPlatform extends PlatformTarget
project.architectures.remove(excludeArchitecture); project.architectures.remove(excludeArchitecture);
} }
targetArchitecture = Type.createEnum(Architecture, Type.enumConstructor(System.hostArchitecture));
for (architecture in project.architectures) for (architecture in project.architectures)
{ {
if (architecture == Architecture.X64) if (architecture.match(X86 | X64 | ARMV6 | ARMV7 | ARM64))
{ {
is64 = true; targetArchitecture = architecture;
break;
} }
} }
@@ -137,7 +127,6 @@ class MacPlatform extends PlatformTarget
else if (project.targetFlags.exists("hl")) else if (project.targetFlags.exists("hl"))
{ {
targetType = "hl"; targetType = "hl";
is64 = true;
} }
else if (project.targetFlags.exists("java")) else if (project.targetFlags.exists("java"))
{ {
@@ -157,7 +146,7 @@ class MacPlatform extends PlatformTarget
} }
targetDirectory = Path.combine(project.app.path, project.config.getString("mac.output-directory", targetType == "cpp" ? "macos" : targetType)); targetDirectory = Path.combine(project.app.path, project.config.getString("mac.output-directory", targetType == "cpp" ? "macos" : targetType));
targetDirectory = StringTools.replace(targetDirectory, "arch64", is64 ? "64" : ""); targetDirectory = StringTools.replace(targetDirectory, "arch64", dirSuffix);
applicationDirectory = targetDirectory + "/bin/" + project.app.file + ".app"; applicationDirectory = targetDirectory + "/bin/" + project.app.file + ".app";
contentDirectory = applicationDirectory + "/Contents/Resources"; contentDirectory = applicationDirectory + "/Contents/Resources";
executableDirectory = applicationDirectory + "/Contents/MacOS"; executableDirectory = applicationDirectory + "/Contents/MacOS";
@@ -179,11 +168,11 @@ class MacPlatform extends PlatformTarget
// TODO: Support single binary for HashLink // TODO: Support single binary for HashLink
if (targetType == "hl") if (targetType == "hl")
{ {
ProjectHelper.copyLibrary(project, ndll, "Mac" + (is64 ? "64" : ""), "", ".hdll", executableDirectory, project.debug, targetSuffix); ProjectHelper.copyLibrary(project, ndll, "Mac" + dirSuffix, "", ".hdll", executableDirectory, project.debug, targetSuffix);
} }
else else
{ {
ProjectHelper.copyLibrary(project, ndll, "Mac" + (is64 ? "64" : ""), "", ProjectHelper.copyLibrary(project, ndll, "Mac" + dirSuffix, "",
(ndll.haxelib != null (ndll.haxelib != null
&& (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll", executableDirectory, && (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll", executableDirectory,
project.debug, targetSuffix); project.debug, targetSuffix);
@@ -197,8 +186,8 @@ class MacPlatform extends PlatformTarget
if (noOutput) return; if (noOutput) return;
NekoHelper.createExecutable(project.templatePaths, "mac" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath); NekoHelper.createExecutable(project.templatePaths, "mac" + dirSuffix, targetDirectory + "/obj/ApplicationMain.n", executablePath);
NekoHelper.copyLibraries(project.templatePaths, "mac" + (is64 ? "64" : ""), executableDirectory); NekoHelper.copyLibraries(project.templatePaths, "mac" + dirSuffix, executableDirectory);
} }
else if (targetType == "hl") else if (targetType == "hl")
{ {
@@ -206,7 +195,7 @@ class MacPlatform extends PlatformTarget
if (noOutput) return; if (noOutput) return;
HashlinkHelper.copyHashlink(project, targetDirectory, executableDirectory, executablePath, is64); HashlinkHelper.copyHashlink(project, targetDirectory, executableDirectory, executablePath, true);
// HashLink looks for hlboot.dat and libraries in the current // HashLink looks for hlboot.dat and libraries in the current
// working directory, so the .app file won't work properly if it // working directory, so the .app file won't work properly if it
@@ -234,7 +223,7 @@ class MacPlatform extends PlatformTarget
System.recursiveCopy(targetDirectory + "/obj/lib", Path.combine(executableDirectory, "lib")); System.recursiveCopy(targetDirectory + "/obj/lib", Path.combine(executableDirectory, "lib"));
System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".jar", System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".jar",
Path.combine(executableDirectory, project.app.file + ".jar")); Path.combine(executableDirectory, project.app.file + ".jar"));
JavaHelper.copyLibraries(project.templatePaths, "Mac" + (is64 ? "64" : ""), executableDirectory); JavaHelper.copyLibraries(project.templatePaths, "Mac" + dirSuffix, executableDirectory);
} }
else if (targetType == "nodejs") else if (targetType == "nodejs")
{ {
@@ -242,8 +231,8 @@ class MacPlatform extends PlatformTarget
if (noOutput) return; if (noOutput) return;
// NekoHelper.createExecutable (project.templatePaths, "Mac" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath); // NekoHelper.createExecutable (project.templatePaths, "Mac" + dirSuffix, targetDirectory + "/obj/ApplicationMain.n", executablePath);
// NekoHelper.copyLibraries (project.templatePaths, "Mac" + (is64 ? "64" : ""), executableDirectory); // NekoHelper.copyLibraries (project.templatePaths, "Mac" + dirSuffix, executableDirectory);
} }
else if (targetType == "cs") else if (targetType == "cs")
{ {
@@ -264,12 +253,18 @@ class MacPlatform extends PlatformTarget
var haxeArgs = [hxml, "-D", "HXCPP_CLANG"]; var haxeArgs = [hxml, "-D", "HXCPP_CLANG"];
var flags = ["-DHXCPP_CLANG"]; var flags = ["-DHXCPP_CLANG"];
if (is64) if (targetArchitecture == X64)
{ {
haxeArgs.push("-D"); haxeArgs.push("-D");
haxeArgs.push("HXCPP_M64"); haxeArgs.push("HXCPP_M64");
flags.push("-DHXCPP_M64"); flags.push("-DHXCPP_M64");
} }
else if (targetArchitecture == ARM64)
{
haxeArgs.push("-D");
haxeArgs.push("HXCPP_ARM64");
flags.push("-DHXCPP_ARM64");
}
if (!project.targetFlags.exists("static")) if (!project.targetFlags.exists("static"))
{ {
@@ -332,7 +327,7 @@ class MacPlatform extends PlatformTarget
context.NODE_FILE = executableDirectory + "/ApplicationMain.js"; context.NODE_FILE = executableDirectory + "/ApplicationMain.js";
context.HL_FILE = targetDirectory + "/obj/ApplicationMain.hl"; context.HL_FILE = targetDirectory + "/obj/ApplicationMain.hl";
context.CPP_DIR = targetDirectory + "/obj/"; context.CPP_DIR = targetDirectory + "/obj/";
context.BUILD_DIR = project.app.path + "/mac" + (is64 ? "64" : ""); context.BUILD_DIR = project.app.path + "/mac" + dirSuffix;
return context; return context;
} }
@@ -372,22 +367,27 @@ class MacPlatform extends PlatformTarget
{ {
var commands = []; var commands = [];
if (targetFlags.exists("hl") && System.hostArchitecture == X64) switch (System.hostArchitecture)
{ {
// TODO: Support single binary case X64:
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64", "-Dhashlink"]); if (targetFlags.exists("hl"))
} {
else // TODO: Support single binary
{ commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64", "-Dhashlink"]);
if (!targetFlags.exists("32") && (command == "rebuild" || System.hostArchitecture == X64)) }
{ else if (!targetFlags.exists("32"))
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64"]); {
} commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M64"]);
}
if (!targetFlags.exists("64") && (targetFlags.exists("32") || System.hostArchitecture == X86)) else
{ {
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M32"]);
}
case X86:
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M32"]); commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_M32"]);
} case ARM64:
commands.push(["-Dmac", "-DHXCPP_CLANG", "-DHXCPP_ARM64"]);
default:
} }
if (targetFlags.exists("hl")) if (targetFlags.exists("hl"))
@@ -455,7 +455,7 @@ class MacPlatform extends PlatformTarget
if (ndll.path == null || ndll.path == "") if (ndll.path == null || ndll.path == "")
{ {
context.ndlls[i].path = NDLL.getLibraryPath(ndll, "Mac" + (is64 ? "64" : ""), "lib", ".a", project.debug); context.ndlls[i].path = NDLL.getLibraryPath(ndll, "Mac" + dirSuffix, "lib", ".a", project.debug);
} }
} }
} }
@@ -530,4 +530,11 @@ class MacPlatform extends PlatformTarget
@ignore public override function trace():Void {} @ignore public override function trace():Void {}
@ignore public override function uninstall():Void {} @ignore public override function uninstall():Void {}
// Getters & Setters
private inline function get_dirSuffix():String
{
return targetArchitecture == X64 ? "64" : "";
}
} }