[orx-syphon] Add support for arm64 architecture (#328)

openrndr · Mar 14, 2024 · fed97e6 · fed97e6
1 parent 5f7a53d
commit fed97e6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt
@@ -9,8 +9,16 @@ object JSyphonNative {
     init {
         require(Platform.type == PlatformType.MAC) { "orx-syphon only works on macOS, your platform is not supported" }
 
+        val arch = System.getProperty("os.arch")
+        val libraries = when (arch) {
+            "x86-64",
+            "x86_64",
+            "amd64",
+            "x64" -> arrayOf("Syphon-x86", "libJSyphon-x86.jnilib")
+
+            else -> arrayOf("Syphon-arm64", "libJSyphon-arm64.jnilib")
+        }
         val tempBase = Platform.tempDirectory()
-        val libraries = arrayOf("Syphon", "libJSyphon.jnilib")
         val tempDir = File(tempBase, "orx-syphon")
         tempDir.mkdirs()
         for (library in libraries) {

diff --git a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon-arm64 b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon-arm64
diff --git a/...src/main/resources/jsyphon-natives/Syphon → ...main/resources/jsyphon-natives/Syphon-x86 b/...src/main/resources/jsyphon-natives/Syphon → ...main/resources/jsyphon-natives/Syphon-x86
diff --git a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon-arm64.jnilib b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon-arm64.jnilib
diff --git a/...sources/jsyphon-natives/libJSyphon.jnilib → ...ces/jsyphon-natives/libJSyphon-x86.jnilib b/...sources/jsyphon-natives/libJSyphon.jnilib → ...ces/jsyphon-natives/libJSyphon-x86.jnilib