From 9cd01b167f876acbc8594653aed8421024b26cad Mon Sep 17 00:00:00 2001 From: Avently <7953703+avently@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:43:04 +0700 Subject: [PATCH] temp --- .../kotlin/chat/simplex/desktop/Main.kt | 4 +++ scripts/desktop/build-lib-windows.sh | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100755 scripts/desktop/build-lib-windows.sh 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 4d97bc49b0..8e6939ff17 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 @@ -19,6 +19,10 @@ private fun initHaskell() { val libApp = "libapp-lib.${desktopPlatform.libExtension}" val libsTmpDir = File(tmpDir.absolutePath + File.separator + "libs") 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) libsTmpDir.deleteRecursively() initHS() diff --git a/scripts/desktop/build-lib-windows.sh b/scripts/desktop/build-lib-windows.sh new file mode 100755 index 0000000000..8e572d9620 --- /dev/null +++ b/scripts/desktop/build-lib-windows.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +OS=windows +ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`} +GHC_VERSION=8.10.7 + +BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-* + +rm -rf $BUILD_DIR +rm cabal.project.local +echo "ignore-project: False" > cabal.project.local +echo "package direct-sqlcipher" > cabal.project.local +echo " flags: +openssl" > cabal.project.local +echo " extra-include-dirs: `pwd`/openssl-3/x64/include" > cabal.project.local +echo " extra-lib-dirs: `pwd`/openssl-3/x64/lib" > cabal.project.local +echo "package simplex-chat" > cabal.project.local +echo " ghc-options: -shared -o libsimplex.dll -optl-lHSrts_thr -optl-lffi" > cabal.project.local +cabal build lib:simplex-chat +#cd $BUILD_DIR/build +#mkdir deps +#ldd libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so | grep "ghc" | cut -d' ' -f 3 | xargs -I {} cp {} ./deps/ + +#cd - + +rm -rf apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/ +rm -rf apps/multiplatform/desktop/src/jvmMain/resources/libs/$OS-$ARCH/ +rm -rf apps/multiplatform/desktop/build/cmake + +mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/ +#cp -r $BUILD_DIR/build/deps apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/ +cp libsimplex.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/