Add AArch64 macOS support

Signed-off-by: Graham <gpe@openrs2.org>
Graham 4 years ago
parent 3091409f82
commit 885fa3d0ed
  1. 2
      buildSrc/src/main/kotlin/Versions.kt
  2. 3
      patcher/src/main/kotlin/org/openrs2/patcher/Architecture.kt
  3. 3
      patcher/src/main/kotlin/org/openrs2/patcher/OperatingSystem.kt

@ -25,7 +25,7 @@ object Versions {
const val logback = "1.2.3" const val logback = "1.2.3"
const val netty = "4.1.58.Final" const val netty = "4.1.58.Final"
const val nettyIoUring = "0.0.3.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 postgres = "42.2.18"
const val shadowPlugin = "6.1.0" const val shadowPlugin = "6.1.0"
const val versionsPlugin = "0.36.0" const val versionsPlugin = "0.36.0"

@ -4,7 +4,8 @@ public enum class Architecture(
public val needles: List<String> public val needles: List<String>
) { ) {
I386(listOf("i386", "x86")), I386(listOf("i386", "x86")),
AMD64(listOf("amd64", "x86_64")); AMD64(listOf("amd64", "x86_64")),
AARCH64(listOf("aarch64"));
public val id: String = name.toLowerCase() public val id: String = name.toLowerCase()
} }

@ -1,5 +1,6 @@
package org.openrs2.patcher package org.openrs2.patcher
import org.openrs2.patcher.Architecture.AARCH64
import org.openrs2.patcher.Architecture.AMD64 import org.openrs2.patcher.Architecture.AMD64
import org.openrs2.patcher.Architecture.I386 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 // AMD64 must be before I386 as x86 is a substring of x86_64
WINDOWS("win", listOf(AMD64, I386), listOf("jaggl.dll")), 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")); LINUX("linux", listOf(AMD64, I386), listOf("libjaggl.so", "libjaggl_dri.so"));
public val id: String = name.toLowerCase() public val id: String = name.toLowerCase()

Loading…
Cancel
Save