From 4df95fd0872edfc24a7b9794bc137cc6b7adf4fb Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 24 Aug 2024 15:37:07 -0400 Subject: [PATCH] Include more runtime libraries for libcurl support --- mingw-cross/buildall.sh | 2 +- mingw-cross/installer/lammps-admin.nsis | 5 +++++ mingw-cross/installer/lammps-gui.nsis | 5 +++++ mingw-cross/installer/lammps-msix.nsis | 5 +++++ mingw-cross/installer/lammps-msmpi.nsis | 5 +++++ mingw-cross/installer/lammps-noadmin.nsis | 5 +++++ mingw-cross/installer/lammps-python.nsis | 5 +++++ 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mingw-cross/buildall.sh b/mingw-cross/buildall.sh index cac70a5..d25e623 100755 --- a/mingw-cross/buildall.sh +++ b/mingw-cross/buildall.sh @@ -5,7 +5,7 @@ if [ $# -ne 1 ] ; then exit 1 fi -for m in no ms; do \ +for m in ms no; do \ python3 cmake-win-on-linux.py -v yes -r "$1" -p ${m} -t omp -b 64 -a no python3 cmake-win-on-linux.py -v yes -r "$1" -p ${m} -t omp -b 64 -a no -y yes done diff --git a/mingw-cross/installer/lammps-admin.nsis b/mingw-cross/installer/lammps-admin.nsis index dade855..f764090 100644 --- a/mingw-cross/installer/lammps-admin.nsis +++ b/mingw-cross/installer/lammps-admin.nsis @@ -156,6 +156,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libwinpthread-1.dll File ${MINGW}/libbz2-1.dll File ${MINGW}/libzstd.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/zlib1.dll File *.exe diff --git a/mingw-cross/installer/lammps-gui.nsis b/mingw-cross/installer/lammps-gui.nsis index d827412..b2aeee8 100644 --- a/mingw-cross/installer/lammps-gui.nsis +++ b/mingw-cross/installer/lammps-gui.nsis @@ -208,6 +208,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libbz2-1.dll File ${MINGW}/libzstd.dll File ${MINGW}/zlib1.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/Qt5Core.dll File ${MINGW}/Qt5Gui.dll File ${MINGW}/Qt5Widgets.dll diff --git a/mingw-cross/installer/lammps-msix.nsis b/mingw-cross/installer/lammps-msix.nsis index 9c90d3b..972c55e 100644 --- a/mingw-cross/installer/lammps-msix.nsis +++ b/mingw-cross/installer/lammps-msix.nsis @@ -154,6 +154,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libwinpthread-1.dll File ${MINGW}/libbz2-1.dll File ${MINGW}/libzstd.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/zlib1.dll File *.exe diff --git a/mingw-cross/installer/lammps-msmpi.nsis b/mingw-cross/installer/lammps-msmpi.nsis index 07e1503..f3f8c2d 100644 --- a/mingw-cross/installer/lammps-msmpi.nsis +++ b/mingw-cross/installer/lammps-msmpi.nsis @@ -202,6 +202,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libwinpthread-1.dll File ${MINGW}/libbz2-1.dll File ${MINGW}/libzstd.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/zlib1.dll File *.exe diff --git a/mingw-cross/installer/lammps-noadmin.nsis b/mingw-cross/installer/lammps-noadmin.nsis index d9a76b9..8625698 100644 --- a/mingw-cross/installer/lammps-noadmin.nsis +++ b/mingw-cross/installer/lammps-noadmin.nsis @@ -155,6 +155,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libwinpthread-1.dll File ${MINGW}/libbz2-1.dll File ${MINGW}/libzstd.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/zlib1.dll File *.exe diff --git a/mingw-cross/installer/lammps-python.nsis b/mingw-cross/installer/lammps-python.nsis index 99c5e3b..3aa000b 100644 --- a/mingw-cross/installer/lammps-python.nsis +++ b/mingw-cross/installer/lammps-python.nsis @@ -166,6 +166,11 @@ Section "${LAMMPS}" SecLammps File ${MINGW}/libzstd.dll File ${MINGW}/tcl86.dll File ${MINGW}/tk86.dll + File ${MINGW}/libcurl-4.dll + File ${MINGW}/libssh2-1.dll + File ${MINGW}/libidn2-0.dll + File ${MINGW}/libcrypto-3-x64.dll + File ${MINGW}/libssl-3-x64.dll File ${MINGW}/zlib1.dll File *.exe