From c0cbb7cff88248d35580cb5b1d92a77dc12a36ee Mon Sep 17 00:00:00 2001 From: Lily Date: Sat, 26 Oct 2024 20:58:50 +0300 Subject: [PATCH 1/3] Fix ARMV7 on hostArchitecture --- src/hxp/System.hx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/hxp/System.hx b/src/hxp/System.hx index 303a1d7..6bf8d51 100644 --- a/src/hxp/System.hx +++ b/src/hxp/System.hx @@ -1426,6 +1426,10 @@ class System { _hostArchitecture = ARM64; } + else if (architecture.indexOf("ARMV7") > -1) + { + _hostArchitecture = ARMV7; + } else if (architecture.indexOf("64") > -1 || wow64Architecture != null && wow64Architecture.indexOf("64") > -1) { _hostArchitecture = X64; @@ -1462,11 +1466,11 @@ class System { _hostArchitecture = ARMV6; } - else if (output.indexOf("armv7") > -1) + else if (output.indexOf("armv7") > -1 || output.indexOf("armv7l")) { _hostArchitecture = ARMV7; } - else if (output.indexOf("arm64") > -1 || output.indexOf("aarch64") > -1) + else if (output.indexOf("arm64") > -1 || output.indexOf("aarch64") || output.indexOf("armv8l") > -1) { var getconfProcess = new Process("getconf", ["LONG_BIT"]); var getconfOutput = getconfProcess.stdout.readAll().toString(); From af8c2b739c4035914a300d33a18a3f612885ac6d Mon Sep 17 00:00:00 2001 From: Lily Date: Sat, 26 Oct 2024 21:06:46 +0300 Subject: [PATCH 2/3] oops --- src/hxp/System.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hxp/System.hx b/src/hxp/System.hx index 6bf8d51..4f2c861 100644 --- a/src/hxp/System.hx +++ b/src/hxp/System.hx @@ -1466,11 +1466,11 @@ class System { _hostArchitecture = ARMV6; } - else if (output.indexOf("armv7") > -1 || output.indexOf("armv7l")) + else if (output.indexOf("armv7") > -1 || output.indexOf("armv7l") > -1) { _hostArchitecture = ARMV7; } - else if (output.indexOf("arm64") > -1 || output.indexOf("aarch64") || output.indexOf("armv8l") > -1) + else if (output.indexOf("arm64") > -1 || output.indexOf("aarch64") > -1 || output.indexOf("armv8l") > -1) { var getconfProcess = new Process("getconf", ["LONG_BIT"]); var getconfOutput = getconfProcess.stdout.readAll().toString(); From 1683d100e5c14a5b3bea8815cd51788e78d6c129 Mon Sep 17 00:00:00 2001 From: Lily Date: Sat, 26 Oct 2024 21:10:40 +0300 Subject: [PATCH 3/3] right we no need that --- src/hxp/System.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hxp/System.hx b/src/hxp/System.hx index 4f2c861..67143da 100644 --- a/src/hxp/System.hx +++ b/src/hxp/System.hx @@ -1466,7 +1466,7 @@ class System { _hostArchitecture = ARMV6; } - else if (output.indexOf("armv7") > -1 || output.indexOf("armv7l") > -1) + else if (output.indexOf("armv7") > -1) { _hostArchitecture = ARMV7; }