Commit 318e3862 authored by Nikolay Igotti's avatar Nikolay Igotti

Another attempt.

parent 0b4b3f85
...@@ -358,7 +358,9 @@ tasks.withType(LinkSharedLibrary::class.java).configureEach { ...@@ -358,7 +358,9 @@ tasks.withType(LinkSharedLibrary::class.java).configureEach {
linkerArgs.addAll( linkerArgs.addAll(
listOf( listOf(
"-lGL", "-lGL",
"-lfontconfig" "-lfontconfig",
// Hack to fix problem with linker not always finding certain declarations.
skiaDir.get().absolutePath + "/out/${buildType.id}-${targetArch.id}/libsksg.a"
) )
) )
} }
...@@ -413,12 +415,6 @@ library { ...@@ -413,12 +415,6 @@ library {
implementation(fileTree("$buildDir/objc/$target").matching { implementation(fileTree("$buildDir/objc/$target").matching {
include("**.o") include("**.o")
}) })
// Hack to fix problems with linker not always finding certain declarations.
if (targetOs == OS.Linux)
skiaDir.map {
fileTree(it.resolve("out/${buildType.id}-${targetArch.id}"))
.matching { include("libsksg.lib") }
}
} }
toolChains { toolChains {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment