Another round of fixes, cinterop works again

This commit is contained in:
Ugljesa Jovanovic 2020-06-07 01:06:21 +02:00 committed by Ugljesa Jovanovic
parent 1be0470745
commit 2aa805fa52
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F

View File

@ -279,9 +279,9 @@ kotlin {
val linux64Bit = setOf( val linux64Bit = setOf(
"linuxX64" "linuxX64"
) )
val linuxArm64Bit = setOf { val linuxArm64Bit = setOf(
"linuxArm64" "linuxArm64"
} )
val linux32Bit = setOf( val linux32Bit = setOf(
"" // "linuxArm32Hfp" "" // "linuxArm32Hfp"
) )
@ -325,6 +325,7 @@ kotlin {
} }
} }
if (linuxArm64Bit.contains(this@withType.name)) { if (linuxArm64Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaroundNativeMainSourceSet(this@withType.name, nativeDependencies))
compilations.getByName("main") { compilations.getByName("main") {
val libsodiumCinterop by cinterops.creating { val libsodiumCinterop by cinterops.creating {
defFile(project.file("src/nativeInterop/cinterop/libsodium.def")) defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))