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

Merge branch 'develop' into 8.3.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2025-03-03 13:19:35 -08:00
parent d7b2b75f1e 3aa32e2167
commit 9f9a5b9f31
22 changed files with 188 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/CommandLineTools.hx
View File

@@ -952,6 +952,12 @@ class CommandLineTools
Log.println(" " + Log.accentColor + "Options:" + Log.resetColor);
Log.println("");
if (command == "setup")
{
Log.println(" \x1b[1m-cli\x1b[0;3m/\x1b[0m\x1b[1m-alias\x1b[0m -- Set up " + defaultLibraryName + " alias only, skipping haxelib installs");
Log.println(" \x1b[1m-noalias\x1b[0m -- Do not set up " + defaultLibraryName + " alias");
}
if (isBuildCommand)
{
Log.println(" \x1b[1m-D\x1b[0;3mvalue\x1b[0m -- Specify a define to use when processing other commands");

17
tools/platforms/IOSPlatform.hx
View File

@@ -336,22 +336,7 @@ class IOSPlatform extends PlatformTarget
context.IOS_COMPILER = project.config.getString("ios.compiler", "clang");
context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp");
var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json"));
var version = Std.string(json.version);
var versionSplit = version.split(".");
while (versionSplit.length > 2)
versionSplit.pop();
if (Std.parseFloat(versionSplit.join(".")) > 3.1)
{
context.CPP_LIBPREFIX = "lib";
}
else
{
context.CPP_LIBPREFIX = "";
}
context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;";
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("ios.linker-flags"));
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", false);

17
tools/platforms/TVOSPlatform.hx
View File

@@ -267,22 +267,7 @@ class TVOSPlatform extends PlatformTarget
context.IOS_COMPILER = project.config.getString("tvos.compiler", "clang");
context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp");
var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json"));
var version = Std.string(json.version);
var versionSplit = version.split(".");
while (versionSplit.length > 2)
versionSplit.pop();
if (Std.parseFloat(versionSplit.join(".")) > 3.1)
{
context.CPP_LIBPREFIX = "lib";
}
else
{
context.CPP_LIBPREFIX = "";
}
context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;";
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("tvos.linker-flags"));
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("tvos.non-exempt-encryption", true);

32
tools/utils/PlatformSetup.hx
View File

@@ -875,13 +875,16 @@ class PlatformSetup
var installedCommand = false;
var answer = YES;
if (targetFlags.exists("y"))
if (!(targetFlags.exists("alias") || targetFlags.exists("cli")))
{
Sys.println("Do you want to install the \"lime\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"lime\" command?");
if (targetFlags.exists("y"))
{
Sys.println("Do you want to install the \"lime\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"lime\" command?");
}
}
if (answer == YES || answer == ALWAYS)
@@ -1123,13 +1126,16 @@ class PlatformSetup
var installedCommand = false;
var answer = YES;
if (targetFlags.exists("y"))
if (!(targetFlags.exists("alias") || targetFlags.exists("cli")))
{
Sys.println("Do you want to install the \"openfl\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"openfl\" command?");
if (targetFlags.exists("y"))
{
Sys.println("Do you want to install the \"openfl\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"openfl\" command?");
}
}
if (answer == YES || answer == ALWAYS)
@@ -1232,6 +1238,8 @@ class PlatformSetup
var message = "Absolute path to a custom version of HashLink.";
if (ConfigHelper.getConfigValue("HL_PATH") == null) {
message += " Leave empty to use Lime's default bundled version.";
} else {
message += " Leave empty to keep the currently configured version. To restore Lime's default bundled version, run the command: lime config remove HL_PATH";
}
getDefineValue("HL_PATH", message);
if (System.hostPlatform == MAC)