From b95065fd70fa74b6fcb03cc21390e7cd1429a3ff Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 16 Jun 2020 15:28:10 +0300 Subject: [PATCH] Openssl build for windows xp --- Common/3dParty/openssl/openssl.pri | 9 ++++++--- DesktopEditor/xmlsec/src/ooxmlsignature.pro | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Common/3dParty/openssl/openssl.pri b/Common/3dParty/openssl/openssl.pri index f7a6e3b5c5..ecf22a2381 100644 --- a/Common/3dParty/openssl/openssl.pri +++ b/Common/3dParty/openssl/openssl.pri @@ -1,7 +1,10 @@ -INCLUDEPATH += $$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/include +OPEN_SSL_PLATFORM=$$CORE_BUILDS_PLATFORM_PREFIX +build_xp:OPEN_SSL_PLATFORM=$$join(OPEN_SSL_PLATFORM, OPEN_SSL_PLATFORM, "", "_xp") -core_windows:LIBS += -L$$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/lib -llibcrypto -llibssl -!core_windows:LIBS += -L$$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/lib -lcrypto -lssl +INCLUDEPATH += $$PWD/build/$$OPEN_SSL_PLATFORM/include + +core_windows:LIBS += -L$$PWD/build/$$OPEN_SSL_PLATFORM/lib -llibcrypto -llibssl +!core_windows:LIBS += -L$$PWD/build/$$OPEN_SSL_PLATFORM/lib -lcrypto -lssl open_ssl_common { DEFINES += COMMON_OPENSSL_BUILDING diff --git a/DesktopEditor/xmlsec/src/ooxmlsignature.pro b/DesktopEditor/xmlsec/src/ooxmlsignature.pro index a8cc46a661..e6b08abb64 100644 --- a/DesktopEditor/xmlsec/src/ooxmlsignature.pro +++ b/DesktopEditor/xmlsec/src/ooxmlsignature.pro @@ -60,3 +60,4 @@ SOURCES += \ CONFIG += open_ssl_common include(../../../Common/3dParty/openssl/openssl.pri) +build_xp:DESTDIR=$$DESTDIR/xp