From d7929f93f24fa37c73d9bdd88cfbde3e1bf7a019 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 5 Jan 2024 12:05:52 +0100 Subject: [PATCH] [K/N] Fix samples compilation --- .../tests/samples/libcurl/build.gradle.kts | 6 +++--- .../tests/samples/videoplayer/build.gradle.kts | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kotlin-native/backend.native/tests/samples/libcurl/build.gradle.kts b/kotlin-native/backend.native/tests/samples/libcurl/build.gradle.kts index b846d8f3c8d..6e42cc3642c 100644 --- a/kotlin-native/backend.native/tests/samples/libcurl/build.gradle.kts +++ b/kotlin-native/backend.native/tests/samples/libcurl/build.gradle.kts @@ -21,9 +21,9 @@ kotlin { compilations["main"].cinterops { val libcurl by creating { when (preset) { - presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include") - presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu") - presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("include")) + this@kotlin.presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include") + this@kotlin.presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu") + this@kotlin.presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("include")) } } } diff --git a/kotlin-native/backend.native/tests/samples/videoplayer/build.gradle.kts b/kotlin-native/backend.native/tests/samples/videoplayer/build.gradle.kts index 7e699f83b48..6f37846ea00 100644 --- a/kotlin-native/backend.native/tests/samples/videoplayer/build.gradle.kts +++ b/kotlin-native/backend.native/tests/samples/videoplayer/build.gradle.kts @@ -22,9 +22,9 @@ kotlin { entryPoint = "sample.videoplayer.main" when (preset) { - presets["macosX64"] -> linkerOpts("-L/opt/local/lib", "-L/usr/local/lib") - presets["linuxX64"] -> linkerOpts("-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib64") - presets["mingwX64"] -> linkerOpts("-L${mingwPath.resolve("lib")}") + this@kotlin.presets["macosX64"] -> linkerOpts("-L/opt/local/lib", "-L/usr/local/lib") + this@kotlin.presets["linuxX64"] -> linkerOpts("-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib64") + this@kotlin.presets["mingwX64"] -> linkerOpts("-L${mingwPath.resolve("lib")}") } } } @@ -32,16 +32,16 @@ kotlin { compilations["main"].cinterops { val ffmpeg by creating { when (preset) { - presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include") - presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/ffmpeg") - presets["mingwX64"] -> includeDirs(mingwPath.resolve("include")) + this@kotlin.presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include") + this@kotlin.presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/ffmpeg") + this@kotlin.presets["mingwX64"] -> includeDirs(mingwPath.resolve("include")) } } val sdl by creating { when (preset) { - presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2") - presets["linuxX64"] -> includeDirs("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/SDL2") - presets["mingwX64"] -> includeDirs(mingwPath.resolve("include/SDL2")) + this@kotlin.presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2") + this@kotlin.presets["linuxX64"] -> includeDirs("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/SDL2") + this@kotlin.presets["mingwX64"] -> includeDirs(mingwPath.resolve("include/SDL2")) } } }