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

Merge pull request #1745 from MAJigsaw77/patch-1

Browse Source 
Don't compile `armv7` if the `architecture` excluded it.
This commit is contained in:
player-03
2024-01-18 13:35:55 -05:00
committed by GitHub
parent a414f64173 86bcc7352d
commit d520fc6a85
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/platforms/AndroidPlatform.hx
View File

@@ -145,11 +145,20 @@ class AndroidPlatform extends PlatformTarget
var architectures = []; var architectures = [];
if (hasARMV5) architectures.push(Architecture.ARMV5); if (hasARMV5) architectures.push(Architecture.ARMV5);
if (hasARMV7 || (!hasARMV5 && !hasX86)) architectures.push(Architecture.ARMV7); if (hasARMV7) architectures.push(Architecture.ARMV7);
if (hasARM64) architectures.push(Architecture.ARM64); if (hasARM64) architectures.push(Architecture.ARM64);
if (hasX86) architectures.push(Architecture.X86); if (hasX86) architectures.push(Architecture.X86);
if (hasX64) architectures.push(Architecture.X64); if (hasX64) architectures.push(Architecture.X64);
if (architectures.length == 0)
{
Log.warn("No architecture selected, defaulting to ARM64.");
hasARM64 = true;
architectures.push(Architecture.ARM64);
}
for (architecture in architectures) for (architecture in architectures)
{ {
var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"]; var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];