From 885fa3d0ed7a0d16788c4bb258063db62be9588b Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 31 Jan 2021 15:21:24 +0000 Subject: [PATCH] Add AArch64 macOS support Signed-off-by: Graham --- buildSrc/src/main/kotlin/Versions.kt | 2 +- patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt | 3 ++- patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 2b4e343f..b483564e 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -25,7 +25,7 @@ object Versions { const val logback = "1.2.3" const val netty = "4.1.58.Final" const val nettyIoUring = "0.0.3.Final" - const val openrs2Natives = "3.1.0" + const val openrs2Natives = "3.2.0" const val postgres = "42.2.18" const val shadowPlugin = "6.1.0" const val versionsPlugin = "0.36.0" diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt b/patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt index 0389ce35..364503d0 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt @@ -4,7 +4,8 @@ public enum class Architecture( public val needles: List ) { I386(listOf("i386", "x86")), - AMD64(listOf("amd64", "x86_64")); + AMD64(listOf("amd64", "x86_64")), + AARCH64(listOf("aarch64")); public val id: String = name.toLowerCase() } diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt b/patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt index a7eb922e..3dc27473 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt @@ -1,5 +1,6 @@ package org.openrs2.patcher +import org.openrs2.patcher.Architecture.AARCH64 import org.openrs2.patcher.Architecture.AMD64 import org.openrs2.patcher.Architecture.I386 @@ -10,7 +11,7 @@ public enum class OperatingSystem( ) { // AMD64 must be before I386 as x86 is a substring of x86_64 WINDOWS("win", listOf(AMD64, I386), listOf("jaggl.dll")), - MAC("mac", listOf(AMD64, I386), listOf("libjaggl.dylib")), + MAC("mac", listOf(AARCH64, AMD64, I386), listOf("libjaggl.dylib")), LINUX("linux", listOf(AMD64, I386), listOf("libjaggl.so", "libjaggl_dri.so")); public val id: String = name.toLowerCase()