Merge pull request #35 from GTNewHorizons/oc-arm64

add support for aarch64
GTNewHorizons · Nov 25, 2021 · 3c87db0 · 3c87db0
2 parents 13489c6 + 87faadb
commit 3c87db0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/main/resources/assets/opencomputers/lib/lua52/native.64.arm.so b/src/main/resources/assets/opencomputers/lib/lua52/native.64.arm.so
diff --git a/src/main/resources/assets/opencomputers/lib/lua53/native.64.arm.so b/src/main/resources/assets/opencomputers/lib/lua53/native.64.arm.so
diff --git a/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala b/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala
@@ -116,6 +116,7 @@ abstract class LuaStateFactory {
     else if (SystemUtils.IS_OS_FREE_BSD && Architecture.IS_OS_X86) "native.32.bsd.so"
 
     else if (SystemUtils.IS_OS_LINUX && Architecture.IS_OS_ARM) "native.32.arm.so"
+    else if (SystemUtils.IS_OS_LINUX && Architecture.IS_OS_ARM) "native.64.arm.so"
     else if (SystemUtils.IS_OS_LINUX && Architecture.IS_OS_X64) "native.64.so"
     else if (SystemUtils.IS_OS_LINUX && Architecture.IS_OS_X86) "native.32.so"
 
@@ -409,6 +410,8 @@ abstract class LuaStateFactory {
 
     val IS_OS_ARM = isOSArchMatch("arm")
 
+    val IS_OS_A64 = isOSArchMatch("aarch64")
+
     val IS_OS_X86 = isOSArchMatch("x86") || isOSArchMatch("i386")
 
     val IS_OS_X64 = isOSArchMatch("x86_64") || isOSArchMatch("amd64")