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

Fix HL on Mac

Browse Source
This commit is contained in:
Joshua Granick
2019-03-14 08:58:17 -07:00
parent 8d72e71357
commit 533dcf82a4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
templates/bin/hl/mac/hl Executable file
View File

Binary file not shown.

BIN
templates/bin/hl/mac/libhl.dylib Executable file
View File

Binary file not shown.

10
tools/platforms/MacPlatform.hx
View File

@@ -95,14 +95,14 @@ 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", applicationDirectory, project ProjectHelper.copyLibrary(project, ndll, "Mac" + (is64 ? "64" : ""), "", ".hdll", executableDirectory, project
.debug, targetSuffix); .debug, targetSuffix);
} }
else else
{ {
ProjectHelper.copyLibrary(project, ndll, "Mac" + (is64 ? "64" : ""), "", ProjectHelper.copyLibrary(project, ndll, "Mac" + (is64 ? "64" : ""), "",
(ndll.haxelib != null && (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll", (ndll.haxelib != null && (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll",
applicationDirectory, project.debug, targetSuffix); executableDirectory, project.debug, targetSuffix);
} }
} }
} }
@@ -124,9 +124,9 @@ class MacPlatform extends PlatformTarget
// System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".hl", // System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".hl",
// Path.combine(executableDirectory, project.app.file + ".hl")); // Path.combine(executableDirectory, project.app.file + ".hl"));
System.recursiveCopyTemplate(project.templatePaths, "bin/hl/mac", applicationDirectory); System.recursiveCopyTemplate(project.templatePaths, "bin/hl/mac", executableDirectory);
System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(applicationDirectory, "hlboot.dat")); System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(executableDirectory, "hlboot.dat"));
System.renameFile(Path.combine(applicationDirectory, "hl"), executablePath); System.renameFile(Path.combine(executableDirectory, "hl"), executablePath);
} }
else if (targetType == "java") else if (targetType == "java")
{ {