Deploy 64 bit version with 64 bit version of openssl.
--HG-- branch : develop
This commit is contained in:
parent
a4a6b18561
commit
991b64cf54
14
common.pri
14
common.pri
|
@ -71,9 +71,17 @@ macx{
|
||||||
# Qt from scratch without OpenSSL support.
|
# Qt from scratch without OpenSSL support.
|
||||||
win32 {
|
win32 {
|
||||||
INSTALL_OPENSSL += \
|
INSTALL_OPENSSL += \
|
||||||
../../../dist/win/libeay32.dll \
|
../../../dist/win/msvcr120.dll
|
||||||
../../../dist/win/ssleay32.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
|
DEFINES += QT_NO_FOREACH
|
||||||
|
|
BIN
dist/win/libeay32.dll
vendored
BIN
dist/win/libeay32.dll
vendored
Binary file not shown.
BIN
dist/win/openssl/win32/libeay32.dll
vendored
Normal file
BIN
dist/win/openssl/win32/libeay32.dll
vendored
Normal file
Binary file not shown.
BIN
dist/win/openssl/win32/ssleay32.dll
vendored
Normal file
BIN
dist/win/openssl/win32/ssleay32.dll
vendored
Normal file
Binary file not shown.
BIN
dist/win/openssl/win64/libeay32.dll
vendored
Normal file
BIN
dist/win/openssl/win64/libeay32.dll
vendored
Normal file
Binary file not shown.
BIN
dist/win/openssl/win64/ssleay32.dll
vendored
Normal file
BIN
dist/win/openssl/win64/ssleay32.dll
vendored
Normal file
Binary file not shown.
BIN
dist/win/ssleay32.dll
vendored
BIN
dist/win/ssleay32.dll
vendored
Binary file not shown.
|
@ -280,8 +280,6 @@ win32:*g++* {
|
||||||
$$PWD/../../../dist/win/s-measurements.ico \
|
$$PWD/../../../dist/win/s-measurements.ico \
|
||||||
$$PWD/../../../dist/win/pattern.ico \
|
$$PWD/../../../dist/win/pattern.ico \
|
||||||
$$PWD/../../../dist/win/pdftops.exe \
|
$$PWD/../../../dist/win/pdftops.exe \
|
||||||
$$PWD/../../../dist/win/libeay32.dll \
|
|
||||||
$$PWD/../../../dist/win/ssleay32.dll \
|
|
||||||
$$PWD/../../../dist/win/msvcr120.dll \
|
$$PWD/../../../dist/win/msvcr120.dll \
|
||||||
$$PWD/../../../AUTHORS.txt \
|
$$PWD/../../../AUTHORS.txt \
|
||||||
$$PWD/../../../LICENSE_GPL.txt \
|
$$PWD/../../../LICENSE_GPL.txt \
|
||||||
|
@ -316,6 +314,16 @@ win32:*g++* {
|
||||||
package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
|
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
|
package.CONFIG = no_check_exist
|
||||||
INSTALLS += package
|
INSTALLS += package
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user