diff --git a/common.pri b/common.pri index 180d1a5ef..55beb5188 100644 --- a/common.pri +++ b/common.pri @@ -71,9 +71,17 @@ macx{ # Qt from scratch without OpenSSL support. win32 { INSTALL_OPENSSL += \ - ../../../dist/win/libeay32.dll \ - ../../../dist/win/ssleay32.dll \ - ../../../dist/win/msvcr120.dll + ../../../dist/win/msvcr120.dll + + contains(QMAKE_HOST.arch, x86_64) { + INSTALL_OPENSSL += \ + ../../../dist/win/openssl/win64/libeay32.dll \ + ../../../dist/win/openssl/win64/ssleay32.dll + } else { + INSTALL_OPENSSL += \ + ../../../dist/win/openssl/win32/libeay32.dll \ + ../../../dist/win/openssl/win32/ssleay32.dll + } } DEFINES += QT_NO_FOREACH diff --git a/dist/win/libeay32.dll b/dist/win/libeay32.dll deleted file mode 100644 index 528653eca..000000000 Binary files a/dist/win/libeay32.dll and /dev/null differ diff --git a/dist/win/openssl/win32/libeay32.dll b/dist/win/openssl/win32/libeay32.dll new file mode 100644 index 000000000..9eefd6e30 Binary files /dev/null and b/dist/win/openssl/win32/libeay32.dll differ diff --git a/dist/win/openssl/win32/ssleay32.dll b/dist/win/openssl/win32/ssleay32.dll new file mode 100644 index 000000000..1d7fb6acf Binary files /dev/null and b/dist/win/openssl/win32/ssleay32.dll differ diff --git a/dist/win/openssl/win64/libeay32.dll b/dist/win/openssl/win64/libeay32.dll new file mode 100644 index 000000000..b11cdb9b2 Binary files /dev/null and b/dist/win/openssl/win64/libeay32.dll differ diff --git a/dist/win/openssl/win64/ssleay32.dll b/dist/win/openssl/win64/ssleay32.dll new file mode 100644 index 000000000..31ea2e5a8 Binary files /dev/null and b/dist/win/openssl/win64/ssleay32.dll differ diff --git a/dist/win/ssleay32.dll b/dist/win/ssleay32.dll deleted file mode 100644 index 630ad5f36..000000000 Binary files a/dist/win/ssleay32.dll and /dev/null differ diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 6b4dd3202..b72602ee1 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -280,8 +280,6 @@ win32:*g++* { $$PWD/../../../dist/win/s-measurements.ico \ $$PWD/../../../dist/win/pattern.ico \ $$PWD/../../../dist/win/pdftops.exe \ - $$PWD/../../../dist/win/libeay32.dll \ - $$PWD/../../../dist/win/ssleay32.dll \ $$PWD/../../../dist/win/msvcr120.dll \ $$PWD/../../../AUTHORS.txt \ $$PWD/../../../LICENSE_GPL.txt \ @@ -316,6 +314,16 @@ win32:*g++* { package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll } + contains(QMAKE_HOST.arch, x86_64) { + package.files += \ + ../../../dist/win/openssl/win64/libeay32.dll \ + ../../../dist/win/openssl/win64/ssleay32.dll + } else { + package.files += \ + ../../../dist/win/openssl/win32/libeay32.dll \ + ../../../dist/win/openssl/win32/ssleay32.dll + } + package.CONFIG = no_check_exist INSTALLS += package