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

Fix the HashlinkHelper

Browse Source
This commit is contained in:
Apprentice-Alchemist
2022-04-15 09:13:08 +02:00
parent 3a55a30fad
commit 668b3f7ba7
3 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lime/tools/HashlinkHelper.hx
View File

@@ -16,6 +16,7 @@ class HashlinkHelper
if (hlPath == null) if (hlPath == null)
{ {
System.recursiveCopyTemplate(project.templatePaths, 'bin/hl/$platform', applicationDirectory); System.recursiveCopyTemplate(project.templatePaths, 'bin/hl/$platform', applicationDirectory);
System.renameFile(Path.combine(applicationDirectory, "hl" + (platform == WINDOWS ? ".exe" : "")), executablePath);
} }
else else
{ {
@@ -43,13 +44,15 @@ class HashlinkHelper
} }
} }
// make sure no hxcpp hash files remain // make sure no hxcpp hash files or MSVC build artifacts remain
for (file in System.readDirectory(applicationDirectory)) for (file in System.readDirectory(applicationDirectory))
{ {
if (Path.extension(file) == "hash") switch Path.extension(file)
{ {
System.deleteFile(file); case "hash", "lib", "pdb", "ilk", "exp":
System.deleteFile(file);
default:
} }
} }
System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(applicationDirectory, "hlboot.dat")); System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(applicationDirectory, "hlboot.dat"));

14
tools/platforms/MacPlatform.hx
View File

@@ -207,20 +207,6 @@ class MacPlatform extends PlatformTarget
if (noOutput) return; if (noOutput) return;
HashlinkHelper.copyHashlink(project, targetDirectory, applicationDirectory, executablePath); HashlinkHelper.copyHashlink(project, targetDirectory, applicationDirectory, executablePath);
// // System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-Debug" : "") + ".hl",
// // Path.combine(executableDirectory, project.app.file + ".hl"));
// System.recursiveCopyTemplate(project.templatePaths, "bin/hl/mac", executableDirectory);
// // let's not keep around hxcpp's hash files
// for (file in System.readDirectory(applicationDirectory))
// {
// if (Path.extension(file) == "hash")
// {
// System.deleteFile(file);
// }
// }
// System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(executableDirectory, "hlboot.dat"));
// System.renameFile(Path.combine(executableDirectory, "hl"), executablePath);
} }
else if (targetType == "java") else if (targetType == "java")
{ {

24
tools/platforms/WindowsPlatform.hx
View File

@@ -297,17 +297,6 @@ class WindowsPlatform extends PlatformTarget
{ {
ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".hdll", applicationDirectory, project.debug, ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".hdll", applicationDirectory, project.debug,
targetSuffix); targetSuffix);
if (!project.environment.exists("HL_PATH"))
{
var command = #if lime "lime" #else "hxp" #end;
Log.warn("You must define HL_PATH to copy HashLink dependencies, please run '" + command + " setup hl' first");
}
else
{
System.copyFile(project.environment.get("HL_PATH") + '/ssl.hdll', applicationDirectory + '/ssl.hdll');
}
} }
else else
{ {
@@ -344,19 +333,6 @@ class WindowsPlatform extends PlatformTarget
HashlinkHelper.copyHashlink(project, targetDirectory, applicationDirectory, executablePath); HashlinkHelper.copyHashlink(project, targetDirectory, applicationDirectory, executablePath);
// System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(applicationDirectory, project.app.file + ".hl"));
// System.recursiveCopyTemplate(project.templatePaths, "bin/hl/windows", applicationDirectory);
// System.copyFile(targetDirectory + "/obj/ApplicationMain.hl", Path.combine(applicationDirectory, "hlboot.dat"));
// System.renameFile(Path.combine(applicationDirectory, "hl.exe"), executablePath);
// let's not keep around hxcpp's hash files
for (file in System.readDirectory(applicationDirectory))
{
if (Path.extension(file) == "hash")
{
System.deleteFile(file);
}
}
var iconPath = Path.combine(applicationDirectory, "icon.ico"); var iconPath = Path.combine(applicationDirectory, "icon.ico");
if (IconHelper.createWindowsIcon(icons, iconPath) && System.hostPlatform == WINDOWS) if (IconHelper.createWindowsIcon(icons, iconPath) && System.hostPlatform == WINDOWS)