From 24a5f7f091a8d7ca919f1b1e106b89995ec705c0 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 11 Feb 2022 11:24:59 +0100 Subject: [PATCH] Fix M1 support, disable video support for M1 --- build.gradle.kts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f49082d..cc768c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,8 +74,8 @@ val ormlFeatures = setOf( ) /** ## additional OPENRNDR features to be added to this project */ -val openrndrFeatures = setOf( - "video" +val openrndrFeatures = setOfNotNull( + if (DefaultNativePlatform("current").architecture.name != "arm-v8") "video" else null ) /** ## configure the type of logging this project uses */ @@ -218,7 +218,7 @@ class Openrndr { } else when (OperatingSystem.current()) { OperatingSystem.WINDOWS -> "windows" OperatingSystem.MAC_OS -> when (val h = DefaultNativePlatform("current").architecture.name) { - "aarch64" -> "macos-arm64" + "arm-v8" -> "macos-arm64" else -> "macos" } OperatingSystem.LINUX -> when (val h = DefaultNativePlatform("current").architecture.name) { @@ -266,5 +266,4 @@ class Openrndr { } } } -println("this is the architecture we found: ${DefaultNativePlatform("current").architecture.name}") val openrndr = Openrndr()