Commit 0b4b3f85 authored by Nikolay Igotti's avatar Nikolay Igotti

An attempt to fix linking problem on Linux.

parent 0103686a
......@@ -242,8 +242,6 @@ tasks.withType(CppCompile::class.java).configureEach {
listOf(
"-fvisibility=hidden",
"-fvisibility-inlines-hidden",
"-static-libstdc++",
"-static-libgcc",
"-I$jdkHome/include/linux",
"-DSK_BUILD_FOR_LINUX",
"-DSK_R32_SHIFT=16",
......@@ -415,6 +413,12 @@ library {
implementation(fileTree("$buildDir/objc/$target").matching {
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 {
......
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