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

Default hlc target directory is not the same as hl

Browse Source
This commit is contained in:
Josh Tynjala
2024-10-07 09:40:22 -07:00
parent dd79e5852a
commit 895ce877d9
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/platforms/LinuxPlatform.hx
View File

@@ -160,7 +160,13 @@ class LinuxPlatform extends PlatformTarget
targetType = "cpp"; targetType = "cpp";
} }
targetDirectory = Path.combine(project.app.path, project.config.getString("linux.output-directory", targetType == "cpp" ? "linux" : targetType)); var defaultTargetDirectory = switch (targetType)
{
case "cpp": "linux";
case "hl": project.targetFlags.exists("hlc") ? "hlc" : targetType;
default: targetType;
}
targetDirectory = Path.combine(project.app.path, project.config.getString("linux.output-directory", defaultTargetDirectory));
targetDirectory = StringTools.replace(targetDirectory, "arch64", is64 ? "64" : ""); targetDirectory = StringTools.replace(targetDirectory, "arch64", is64 ? "64" : "");
applicationDirectory = targetDirectory + "/bin/"; applicationDirectory = targetDirectory + "/bin/";
executablePath = Path.combine(applicationDirectory, project.app.file); executablePath = Path.combine(applicationDirectory, project.app.file);

8
tools/platforms/MacPlatform.hx
View File

@@ -147,7 +147,13 @@ class MacPlatform extends PlatformTarget
targetType = "cpp"; targetType = "cpp";
} }
targetDirectory = Path.combine(project.app.path, project.config.getString("mac.output-directory", targetType == "cpp" ? "macos" : targetType)); var defaultTargetDirectory = switch (targetType)
{
case "cpp": "macos";
case "hl": project.targetFlags.exists("hlc") ? "hlc" : targetType;
default: targetType;
}
targetDirectory = Path.combine(project.app.path, project.config.getString("mac.output-directory", defaultTargetDirectory));
targetDirectory = StringTools.replace(targetDirectory, "arch64", dirSuffix); 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";

8
tools/platforms/WindowsPlatform.hx
View File

@@ -203,7 +203,13 @@ class WindowsPlatform extends PlatformTarget
} }
} }
targetDirectory = Path.combine(project.app.path, project.config.getString("windows.output-directory", targetType == "cpp" ? "windows" : targetType)); var defaultTargetDirectory = switch (targetType)
{
case "cpp": "windows";
case "hl": project.targetFlags.exists("hlc") ? "hlc" : targetType;
default: targetType;
}
targetDirectory = Path.combine(project.app.path, project.config.getString("windows.output-directory", defaultTargetDirectory));
targetDirectory = StringTools.replace(targetDirectory, "arch64", is64 ? "64" : ""); targetDirectory = StringTools.replace(targetDirectory, "arch64", is64 ? "64" : "");
if (targetType == "winjs") if (targetType == "winjs")