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

Merge branch 'openfl:develop' into submodules

Browse Source
This commit is contained in:
player-03
2022-12-01 11:58:25 -05:00
committed by GitHub
parent 2fd9e9fd08 4c821525b4
commit ea1c233251
43 changed files with 527 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/platforms/AndroidPlatform.hx
View File

@@ -450,7 +450,7 @@ class AndroidPlatform extends PlatformTarget
context.CPP_DIR = targetDirectory + "/obj";
context.OUTPUT_DIR = targetDirectory;
context.ANDROID_INSTALL_LOCATION = project.config.getString("android.install-location", "auto");
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 16);
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 21);
context.ANDROID_TARGET_SDK_VERSION = project.config.getInt("android.target-sdk-version", 28);
context.ANDROID_EXTENSIONS = project.config.getArrayString("android.extension");
context.ANDROID_PERMISSIONS = project.config.getArrayString("android.permission", [

14
tools/platforms/MacPlatform.hx
View File

@@ -207,6 +207,20 @@ class MacPlatform extends PlatformTarget
if (noOutput) return;
HashlinkHelper.copyHashlink(project, targetDirectory, executableDirectory, executablePath, is64);
// HashLink looks for hlboot.dat and libraries in the current
// working directory, so the .app file won't work properly if it
// tries to run the HashLink executable directly.
// when the .app file is launched, we can tell it to run a shell
// script instead of the HashLink executable. the shell script will
// adjusts the working directory before running the HL executable.
// unlike other platforms, we want to use the original "hl" name
var hlExecutablePath = Path.combine(executableDirectory, "hl");
System.renameFile(executablePath, hlExecutablePath);
System.runCommand("", "chmod", ["755", hlExecutablePath]);
// then we can use the executable name for the shell script
System.copyFileTemplate(project.templatePaths, 'hl/mac-launch.sh', executablePath);
}
else if (targetType == "java")
{