Skip to content

Commit 3861d02

Browse files
committed
Add variant plugin, remove native modules for orx-realsense2 and orx-kinect-v1
1 parent db654df commit 3861d02

14 files changed

Lines changed: 50 additions & 62 deletions

File tree

build-logic/orx-convention/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repositories {
1010
}
1111
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
1212
dependencies {
13+
implementation(project(":orx-variant-plugin"))
1314
implementation(libs.findLibrary("kotlin-gradle-plugin").get())
1415
implementation(libs.findLibrary("dokka-gradle-plugin").get())
1516
"preloadImplementation"(openrndr.application)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.openrndr.extra.convention
2+
3+
plugins {
4+
id("orx-variant")
5+
}

build-logic/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include("orx-convention")
1+
include("orx-convention", "orx-variant-plugin")
22

33
dependencyResolutionManagement {
44
repositories {

orx-jvm/orx-kinect-v1-demo/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ dependencies {
99
implementation(project(":orx-jvm:orx-depth-camera-calibrator"))
1010
implementation(project(":orx-fx"))
1111
implementation(project(":orx-jvm:orx-gui"))
12-
runtimeOnly(project(":orx-jvm:orx-kinect-v1-${(gradle as ExtensionAware).extra["openrndrClassifier"]}"))
12+
runtimeOnly(project(":orx-jvm:orx-kinect-v1"))
1313
runtimeOnly(openrndr.gl3)
1414
}

orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

orx-jvm/orx-kinect-v1/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
1+
12
plugins {
23
id("org.openrndr.extra.convention.kotlin-jvm")
4+
id("org.openrndr.extra.convention.variant")
35
}
6+
variants {
7+
val nativeLibs = listOf(libs.libfreenect, sharedLibs.javacpp)
8+
9+
val platforms = listOf(
10+
Triple(OperatingSystemFamily.WINDOWS, MachineArchitecture.X86_64, "windows-x86_64"),
11+
Triple(OperatingSystemFamily.MACOS, MachineArchitecture.X86_64, "macosx-x86_64"),
12+
Triple(OperatingSystemFamily.LINUX, MachineArchitecture.X86_64, "linux-x86_64"),
13+
Triple(OperatingSystemFamily.LINUX, MachineArchitecture.ARM64, "linux-arm64"),
14+
)
415

16+
for ((os, arch, classifier) in platforms) {
17+
platform(os, arch) {
18+
dependencies {
19+
nativeLibs.forEach {
20+
runtimeOnly(it.get().withClassifier(classifier))
21+
}
22+
}
23+
}
24+
}
25+
}
526
dependencies {
627
implementation(openrndr.application)
728
implementation(openrndr.math)

orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)