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

Merge pull request #1531 from player-03/submodules

Browse Source 
Restructure and update submodules
This commit is contained in:
Josh Tynjala
2023-01-13 13:44:33 -08:00
committed by GitHub
parent 43fb0f15c5 ea1c233251
commit 2f4b0844ef
89 changed files with 28650 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/platforms/AndroidPlatform.hx
View File

@@ -349,8 +349,8 @@ class AndroidPlatform extends PlatformTarget
public override function rebuild():Void
{
var armv5 = (command == "rebuild"
|| ArrayTools.containsValue(project.architectures, Architecture.ARMV5)
var armv5 = (/*command == "rebuild" ||*/
ArrayTools.containsValue(project.architectures, Architecture.ARMV5)
|| ArrayTools.containsValue(project.architectures, Architecture.ARMV6));
var armv7 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARMV7));
var arm64 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARM64));
@@ -360,7 +360,7 @@ class AndroidPlatform extends PlatformTarget
var commands = [];
if (armv5) commands.push(["-Dandroid", "-DPLATFORM=android-21"]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-DPLATFORM=android-21"]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DPLATFORM=android-21"]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", "-DPLATFORM=android-21"]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", "-DPLATFORM=android-21"]);
if (x64) commands.push(["-Dandroid", "-DHXCPP_X86_64", "-DPLATFORM=android-21"]);

6
tools/platforms/IOSPlatform.hx
View File

@@ -255,7 +255,7 @@ class IOSPlatform extends PlatformTarget
if (project.config.getString("ios.device", "universal") == "universal" || project.config.getString("ios.device") == "iphone")
{
if (project.config.getFloat("ios.deployment", 9) < 5)
if (project.config.getFloat("ios.deployment", 13) < 5)
{
ArrayTools.addUnique(architectures, Architecture.ARMV6);
}
@@ -315,14 +315,14 @@ class IOSPlatform extends PlatformTarget
case "ipad": "2";
default: "1,2";
}
context.DEPLOYMENT = project.config.getString("ios.deployment", "9.0");
context.DEPLOYMENT = project.config.getString("ios.deployment", "13.6");
if (project.config.getString("ios.compiler") == "llvm" || project.config.getString("ios.compiler", "clang") == "clang")
{
context.OBJC_ARC = true;
}
// context.ENABLE_BITCODE = (project.config.getFloat ("ios.deployment", 9) >= 6);
// context.ENABLE_BITCODE = (project.config.getFloat ("ios.deployment", 13) >= 6);
context.ENABLE_BITCODE = project.config.getBool("ios.enable-bitcode", false);
context.IOS_COMPILER = project.config.getString("ios.compiler", "clang");
context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp");