azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use packages specified in .def files for platform libs

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-10-06 14:18:30 +03:00
committed by SvyatoslavScherbina
parent 3523a71058
commit c7588d7928
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/link/default/default.kt
+1 -1
View File
@@ -1,4 +1,4 @@
import posix.* import platform.posix.*
fun main(args: Array<String>) { fun main(args: Array<String>) {
// Just check the typealias is in scope. // Just check the typealias is in scope.
klib/platform.gradle
-1
View File
@@ -15,7 +15,6 @@ List<String> libraries = gradle.startParameter.projectProperties.libraries.split
konanInterop { konanInterop {
"$taskName" { "$taskName" {
defFile gradle.startParameter.projectProperties.defFile defFile gradle.startParameter.projectProperties.defFile
pkg gradle.startParameter.projectProperties.name
target gradle.startParameter.projectProperties.target target gradle.startParameter.projectProperties.target
noDefaultLibs true noDefaultLibs true
extraOpts libraries.collectMany { ["-library", "$konanHome/klib/$it"] } extraOpts libraries.collectMany { ["-library", "$konanHome/klib/$it"] }
samples/csvparser/src/main/kotlin/CsvParser.kt
+1 -1
View File
@@ -15,7 +15,7 @@
*/ */
import kotlinx.cinterop.* import kotlinx.cinterop.*
import posix.* import platform.posix.*
fun parseLine(line: String, separator: Char) : List<String> { fun parseLine(line: String, separator: Char) : List<String> {
val result = mutableListOf<String>() val result = mutableListOf<String>()
samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt
+1 -1
View File
@@ -15,7 +15,7 @@
*/ */
import kotlinx.cinterop.* import kotlinx.cinterop.*
import posix.* import platform.posix.*
import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.* import kotlin.coroutines.experimental.intrinsics.*
samples/socket/src/main/kotlin/EchoServer.kt
+1 -1
View File
@@ -15,7 +15,7 @@
*/ */
import kotlinx.cinterop.* import kotlinx.cinterop.*
import posix.* import platform.posix.*
fun main(args: Array<String>) { fun main(args: Array<String>) {
if (args.size < 1) { if (args.size < 1) {