kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-olive] Fix compatibility with OPENRNDR 0.4

Browse Source
This commit is contained in:
Edwin Jakobs
2021-07-22 16:29:50 +02:00
parent 54c1c3d0eb
commit 4b424afef8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-jvm/orx-olive/build.gradle
View File

@@ -9,8 +9,8 @@ sourceSets {
} }
dependencies { dependencies {
implementation project(":orx-file-watcher") implementation project(":orx-jvm:orx-file-watcher")
implementation project(":orx-kotlin-parser") implementation project(":orx-jvm:orx-kotlin-parser")
implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion"

2
orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
View File

@@ -35,7 +35,7 @@ fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHos
} }
} }
program = object : OliveProgram(sourceLocation, scriptHost, resources) { program = object : OliveProgram(sourceLocation, scriptHost, resources) {
override fun setup() { override suspend fun setup() {
super.setup() super.setup()
init() init()
} }

2
settings.gradle
View File

@@ -27,7 +27,7 @@ include 'openrndr-demos',
'orx-no-clear', 'orx-no-clear',
'orx-noise', 'orx-noise',
'orx-obj-loader', 'orx-obj-loader',
'orx-olive', 'orx-jvm:orx-olive',
'orx-jvm:orx-osc', 'orx-jvm:orx-osc',
'orx-palette', 'orx-palette',
'orx-jvm:orx-panel', 'orx-jvm:orx-panel',