Skip to content

Commit 521d362

Browse files
committed
fix: correct linux cinterop header and linker setup
1 parent 6f7465e commit 521d362

7 files changed

Lines changed: 11 additions & 6 deletions

File tree

shared/core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ kotlin {
4848
definitionFile = project.file("src/linuxX64Main/cinterop/libsecret.def")
4949
packageName = "tech.watzon.pindrop.shared.core.cinterop.libsecret"
5050
compilerOpts(*pkgConfigArgs("--cflags", "libsecret-1").toTypedArray())
51-
linkerOpts(*pkgConfigArgs("--libs", "libsecret-1").toTypedArray())
5251
}
5352
}
5453
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
headers = libsecret/secret.h
22

33
package = tech.watzon.pindrop.shared.core.cinterop.libsecret
4+
5+
linkerOpts = -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0

shared/ui-shell/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,21 @@ kotlin {
5858
definitionFile = project.file("src/linuxX64Main/cinterop/gtk4.def")
5959
packageName = "tech.watzon.pindrop.shared.uishell.cinterop.gtk4"
6060
compilerOpts(*pkgConfigArgs("--cflags", "gtk4").toTypedArray())
61-
linkerOpts(*pkgConfigArgs("--libs", "gtk4").toTypedArray())
6261
}
6362
val libadwaita by creating {
6463
definitionFile = project.file("src/linuxX64Main/cinterop/libadwaita.def")
6564
packageName = "tech.watzon.pindrop.shared.uishell.cinterop.libadwaita"
6665
compilerOpts(*pkgConfigArgs("--cflags", "libadwaita-1").toTypedArray())
67-
linkerOpts(*pkgConfigArgs("--libs", "libadwaita-1").toTypedArray())
6866
}
6967
val appindicator by creating {
7068
definitionFile = project.file("src/linuxX64Main/cinterop/appindicator.def")
7169
packageName = "tech.watzon.pindrop.shared.uishell.cinterop.appindicator"
7270
compilerOpts(*pkgConfigArgs("--cflags", "ayatana-appindicator3-0.1", "gtk+-3.0").toTypedArray())
73-
linkerOpts(*pkgConfigArgs("--libs", "ayatana-appindicator3-0.1", "gtk+-3.0").toTypedArray())
7471
}
7572
val x11 by creating {
7673
definitionFile = project.file("src/linuxX64Main/cinterop/x11.def")
7774
packageName = "tech.watzon.pindrop.shared.uishell.cinterop.x11"
7875
compilerOpts(*pkgConfigArgs("--cflags", "x11").toTypedArray())
79-
linkerOpts(*pkgConfigArgs("--libs", "x11").toTypedArray())
8076
}
8177
}
8278
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
headers = libayatana-appindicator3-0.1/libayatana-appindicator/app-indicator.h gtk/gtk.h
1+
headers = libayatana-appindicator/app-indicator.h gtk/gtk.h
22

33
package = tech.watzon.pindrop.shared.uishell.cinterop.appindicator
4+
5+
linkerOpts = -layatana-appindicator3 -lgtk-3 -lgdk-3 -lgio-2.0 -lgobject-2.0 -lglib-2.0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
headers = gtk/gtk.h gdk/gdk.h glib.h gobject/gobject.h
22

33
package = tech.watzon.pindrop.shared.uishell.cinterop.gtk4
4+
5+
linkerOpts = -lgtk-4 -lgdk-4 -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
headers = libadwaita-1/adw.h
22

33
package = tech.watzon.pindrop.shared.uishell.cinterop.libadwaita
4+
5+
linkerOpts = -ladwaita-1 -lgtk-4 -lgdk-4 -lgio-2.0 -lgobject-2.0 -lglib-2.0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
headers = X11/Xlib.h X11/keysym.h
2+
3+
linkerOpts = -lX11

0 commit comments

Comments
 (0)