From 8632f8a8f74ae5b1fd1a3aad8662734a96510a01 Mon Sep 17 00:00:00 2001 From: avently Date: Fri, 22 Sep 2023 00:29:52 +0300 Subject: [PATCH] new way of libs loading --- .../src/jvmMain/kotlin/chat/simplex/desktop/Main.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt b/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt index 3879af9dbc..0c29854bcd 100644 --- a/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt +++ b/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt @@ -18,16 +18,10 @@ fun main() { @Suppress("UnsafeDynamicallyLoadedCode") private fun initHaskell() { - val libApp = "libapp-lib.${desktopPlatform.libExtension}" - val libSimplex = "libsimplex.${desktopPlatform.libExtension}" val libsTmpDir = File(tmpDir.absolutePath + File.separator + "libs") + System.setProperty("java.library.path", libsTmpDir.absolutePath) copyResources(desktopPlatform.libPath, libsTmpDir.toPath()) - if (desktopPlatform == DesktopPlatform.WINDOWS_X86_64) { - val libSimplex = "libsimplex.${desktopPlatform.libExtension}" - System.load(File(libsTmpDir, libSimplex).absolutePath) - } - System.load(File(libsTmpDir, libApp).absolutePath) - + System.loadLibrary("libapp-lib") vlcDir.deleteRecursively() Files.move(File(libsTmpDir, "vlc").toPath(), vlcDir.toPath(), StandardCopyOption.REPLACE_EXISTING) // No picture without preloading it, only sound. However, with libs from AppImage it works without preloading