Samples: Fix building for Windows
This commit is contained in:
committed by
Ilya Matveev
parent
3329f74c27
commit
b0296b1c8d
@@ -29,7 +29,7 @@ kotlin {
|
|||||||
entryPoint = "sample.curl.main"
|
entryPoint = "sample.curl.main"
|
||||||
if (isMingwX64) {
|
if (isMingwX64) {
|
||||||
// Add lib path to `libcurl` and its dependencies:
|
// Add lib path to `libcurl` and its dependencies:
|
||||||
linkerOpts(mingwPath.resolve("lib").toString())
|
linkerOpts("-L${mingwPath.resolve("lib")}")
|
||||||
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
||||||
}
|
}
|
||||||
runTask?.args("https://www.jetbrains.com/")
|
runTask?.args("https://www.jetbrains.com/")
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ kotlin {
|
|||||||
executable {
|
executable {
|
||||||
entryPoint = "sample.gitchurn.main"
|
entryPoint = "sample.gitchurn.main"
|
||||||
if (isMingwX64) {
|
if (isMingwX64) {
|
||||||
linkerOpts(mingwPath.resolve("lib").toString())
|
linkerOpts("-L${mingwPath.resolve("lib")}")
|
||||||
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
||||||
}
|
}
|
||||||
runTask?.args(rootProject.rootDir.resolve(".."))
|
runTask?.args(rootProject.rootDir.resolve(".."))
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ kotlin {
|
|||||||
executable {
|
executable {
|
||||||
entryPoint = "sample.gtk.main"
|
entryPoint = "sample.gtk.main"
|
||||||
if (isMingwX64) {
|
if (isMingwX64) {
|
||||||
linkerOpts(mingwPath.resolve("lib").toString())
|
linkerOpts("-L${mingwPath.resolve("lib")}")
|
||||||
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
runTask?.environment("PATH" to mingwPath.resolve("bin"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,13 +50,13 @@ kotlin {
|
|||||||
}
|
}
|
||||||
presets["mingwX64"] -> {
|
presets["mingwX64"] -> {
|
||||||
listOf(
|
listOf(
|
||||||
"/include/atk-1.0",
|
"include/atk-1.0",
|
||||||
"/include/gdk-pixbuf-2.0",
|
"include/gdk-pixbuf-2.0",
|
||||||
"/include/cairo",
|
"include/cairo",
|
||||||
"/include/pango-1.0",
|
"include/pango-1.0",
|
||||||
"/include/gtk-3.0",
|
"include/gtk-3.0",
|
||||||
"/include/glib-2.0",
|
"include/glib-2.0",
|
||||||
"/lib/glib-2.0/include"
|
"lib/glib-2.0/include"
|
||||||
).forEach {
|
).forEach {
|
||||||
includeDirs(mingwPath.resolve(it))
|
includeDirs(mingwPath.resolve(it))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
|
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
|
||||||
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
|
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("multiplatform")
|
kotlin("multiplatform")
|
||||||
@@ -43,7 +43,7 @@ kotlin {
|
|||||||
val jsinterop by tasks.creating(Exec::class) {
|
val jsinterop by tasks.creating(Exec::class) {
|
||||||
workingDir = projectDir
|
workingDir = projectDir
|
||||||
|
|
||||||
val ext = if (isWindows) ".bar" else ""
|
val ext = if (isWindows) ".bat" else ""
|
||||||
val distributionPath = project.properties["org.jetbrains.kotlin.native.home"] as String?
|
val distributionPath = project.properties["org.jetbrains.kotlin.native.home"] as String?
|
||||||
|
|
||||||
if (distributionPath != null) {
|
if (distributionPath != null) {
|
||||||
@@ -73,7 +73,7 @@ val jsinterop by tasks.creating(Exec::class) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(KotlinNativeCompile::class).all {
|
tasks.withType(AbstractKotlinNativeCompile::class).all {
|
||||||
dependsOn(jsinterop)
|
dependsOn(jsinterop)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ kotlin {
|
|||||||
when (preset) {
|
when (preset) {
|
||||||
presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include")
|
presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include")
|
||||||
presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu")
|
presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu")
|
||||||
presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("/include"))
|
presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("include"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ kotlin {
|
|||||||
presets["linuxX64"] -> linkerOpts("-L/usr/lib64", "-L/usr/lib/x86_64-linux-gnu", "-lSDL2")
|
presets["linuxX64"] -> linkerOpts("-L/usr/lib64", "-L/usr/lib/x86_64-linux-gnu", "-lSDL2")
|
||||||
presets["mingwX64"], presets["mingwX86"] -> linkerOpts(
|
presets["mingwX64"], presets["mingwX86"] -> linkerOpts(
|
||||||
winCompiledResourceFile.toString(),
|
winCompiledResourceFile.toString(),
|
||||||
mingwPath.resolve("lib").toString(),
|
"-L${mingwPath.resolve("lib")}",
|
||||||
"-Wl,-Bstatic",
|
"-Wl,-Bstatic",
|
||||||
"-lstdc++",
|
"-lstdc++",
|
||||||
"-static",
|
"-static",
|
||||||
@@ -64,7 +64,7 @@ kotlin {
|
|||||||
when (preset) {
|
when (preset) {
|
||||||
presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
|
presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
|
||||||
presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
|
presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
|
||||||
presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("/include/SDL2"))
|
presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("include/SDL2"))
|
||||||
presets["linuxArm32Hfp"] -> includeDirs(kotlinNativeDataPath.resolve("dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2"))
|
presets["linuxArm32Hfp"] -> includeDirs(kotlinNativeDataPath.resolve("dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ kotlin {
|
|||||||
when (preset) {
|
when (preset) {
|
||||||
presets["macosX64"] -> linkerOpts("-L/opt/local/lib", "-L/usr/local/lib")
|
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["linuxX64"] -> linkerOpts("-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib64")
|
||||||
presets["mingwX64"] -> linkerOpts(mingwPath.resolve("lib").toString())
|
presets["mingwX64"] -> linkerOpts("-L${mingwPath.resolve("lib")}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,14 +34,14 @@ kotlin {
|
|||||||
when (preset) {
|
when (preset) {
|
||||||
presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include")
|
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["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/ffmpeg")
|
||||||
presets["mingwX64"] -> includeDirs(mingwPath.resolve("/include"))
|
presets["mingwX64"] -> includeDirs(mingwPath.resolve("include"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val sdl by creating {
|
val sdl by creating {
|
||||||
when (preset) {
|
when (preset) {
|
||||||
presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
|
presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
|
||||||
presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
|
presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
|
||||||
presets["mingwX64"] -> includeDirs(mingwPath.resolve("/include/SDL2"))
|
presets["mingwX64"] -> includeDirs(mingwPath.resolve("include/SDL2"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user