From 6e8573fd9805177ac7f804e570d74cf9b7ace827 Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Mon, 13 Nov 2023 00:45:29 +0200 Subject: [PATCH] Update glib prefab dependencies --- glib2/build.gradle.kts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/glib2/build.gradle.kts b/glib2/build.gradle.kts index bce186d..b98a9f2 100644 --- a/glib2/build.gradle.kts +++ b/glib2/build.gradle.kts @@ -121,50 +121,52 @@ tasks.prefabPackage { licensePath.set("COPYING") modules { + val isStatic = project.findProperty("libraryType") == "static" create("glib-2.0") { includesPerAbi.set(true) - static.set(project.findProperty("libraryType") == "static") + static.set(isStatic) dependencies.set(listOf( "//proxy-libintl:intl", "m", "//libiconv:iconv", - "//pcre2:pcre2-8" + "//pcre2:pcre2-8", + "//libffi:ffi", )) } create("gio-2.0") { includesPerAbi.set(true) - static.set(project.findProperty("libraryType") == "static") + static.set(isStatic) dependencies.set(listOf( + "//proxy-libintl:intl", ":glib-2.0", ":gobject-2.0", - ":gmodule-no-export-2.0", + ":gmodule-2.0", "z", - "//proxy-libintl:intl" )) } create("gmodule-2.0") { includesPerAbi.set(true) - static.set(project.findProperty("libraryType") == "static") + static.set(isStatic) dependencies.set(listOf( - ":gmodule-no-export-2.0", + "//proxy-libintl:intl", ":glib-2.0", )) } create("gobject-2.0") { includesPerAbi.set(true) - static.set(project.findProperty("libraryType") == "static") + static.set(isStatic) dependencies.set(listOf( + "//proxy-libintl:intl", ":glib-2.0", "//libffi:ffi", - "//proxy-libintl:intl" )) } create("gthread-2.0") { includesPerAbi.set(true) - static.set(project.findProperty("libraryType") == "static") + static.set(isStatic) dependencies.set(listOf( + "//proxy-libintl:intl", ":glib-2.0", - "//proxy-libintl:intl" )) } }