diff --git a/gradle.properties b/gradle.properties index 31b082f..934cf72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ clikt.version=4.4.0 mediasession.version=0.1.1 ytm.version=0.2.5 ktor.version=3.0.0-beta-1 -kjna.version=0.0.5 +kjna.version=0.0.5-TEST11 # Nix org.gradle.java.installations.fromEnv=JAVA_21_HOME,JAVA_22_HOME diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 17871a1..283f691 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -54,7 +54,9 @@ kotlin { libraries = listOf("mpv") jextract { - // macros += listOf("size_t=unsigned long") + if (!OperatingSystem.current().isWindows()) { + macros += listOf("size_t=unsigned long") + } } // if (OperatingSystem.current().isWindows()) { @@ -360,16 +362,13 @@ enum class CinteropLibraries { else -> {} } - val def_file_text: String = + def_file.writeText( """ staticLibraries = ${lib_filenames.joinToString(" ")} libraryPaths = ${lib_dirs.map { it.absolutePath.replace("\\", "/") }.joinToString(" ")} linkerOpts = ${linker_opts.joinToString(" ")} """.trimIndent() - - println("DEF FILE TEXT:\n$def_file_text") - - def_file.writeText(def_file_text) + ) settings.defFile(def_file) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c3c57d..90a4a9f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,7 @@ pluginManagement { repositories { mavenLocal() + maven("https://maven.toastbits.dev/") mavenCentral() gradlePluginPortal() maven("https://jitpack.io") @@ -34,6 +35,7 @@ pluginManagement { dependencyResolutionManagement { repositories { mavenLocal() + maven("https://maven.toastbits.dev/") maven("https://jitpack.io") mavenCentral() }