diff --git a/Common/3dParty/curl/curl.pri b/Common/3dParty/curl/curl.pri index 72b2ac45eb..7a85630ab3 100644 --- a/Common/3dParty/curl/curl.pri +++ b/Common/3dParty/curl/curl.pri @@ -1,5 +1,5 @@ core_linux { INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include - LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libcurl.a + LIBS += -lcurl } diff --git a/Common/3dParty/icu/fetch.bat b/Common/3dParty/icu/fetch.bat index 7400779524..d9cb8bd1ff 100644 --- a/Common/3dParty/icu/fetch.bat +++ b/Common/3dParty/icu/fetch.bat @@ -1,7 +1,7 @@ SET SCRIPTPATH=%~dp0 CD /D %~dp0 -SET ICU_MAJOR_VER=60 +SET ICU_MAJOR_VER=58 SET ICU_MINOR_VER=2 SET build_platform=win_32 diff --git a/Common/3dParty/icu/fetch.sh b/Common/3dParty/icu/fetch.sh index a14288e743..3cc59aebda 100755 --- a/Common/3dParty/icu/fetch.sh +++ b/Common/3dParty/icu/fetch.sh @@ -3,7 +3,7 @@ SCRIPT=$(readlink -f "$0" || grealpath "$0") SCRIPTPATH=$(dirname "$SCRIPT") -ICU_MAJOR_VER=60 +ICU_MAJOR_VER=58 ICU_MINOR_VER=2 SHARED_LIB_VER=$ICU_MAJOR_VER.$ICU_MINOR_VER diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri index 7e145da50b..44036da204 100644 --- a/Common/3dParty/icu/icu.pri +++ b/Common/3dParty/icu/icu.pri @@ -1,3 +1,5 @@ +ICU_MAJOR_VER = 58 + core_windows { message($$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/include) INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/include @@ -14,13 +16,13 @@ core_win_32 { core_linux { INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include - LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.60 - LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.60 + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.$$ICU_MAJOR_VER + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.$$ICU_MAJOR_VER } core_mac { INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include - LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.60.dylib - LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.60.dylib + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.$${ICU_MAJOR_VER}.dylib + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.$${ICU_MAJOR_VER}.dylib } diff --git a/Common/3dParty/openssl/openssl.pri b/Common/3dParty/openssl/openssl.pri new file mode 100644 index 0000000000..6004d086df --- /dev/null +++ b/Common/3dParty/openssl/openssl.pri @@ -0,0 +1,12 @@ +core_linux { + +#DEFINES += XMLSEC_OPENSSL_110 +#INCLUDEPATH += $$CORE_ROOT_DIR/Common/3dParty/openssl/openssl/include +#LIBS += -L$$CORE_ROOT_DIR/Common/3dParty/openssl/openssl -lssl +#LIBS += -L$$CORE_ROOT_DIR/Common/3dParty/openssl/openssl -lcrypto + +#INCLUDEPATH += /usr/include/openssl +LIBS += -lssl +LIBS += -lcrypto + +} diff --git a/DesktopEditor/xmlsec/src/ooxmlsignature.pro b/DesktopEditor/xmlsec/src/ooxmlsignature.pro index 9814cc0123..2bbd3dc87d 100644 --- a/DesktopEditor/xmlsec/src/ooxmlsignature.pro +++ b/DesktopEditor/xmlsec/src/ooxmlsignature.pro @@ -67,10 +67,6 @@ SOURCES += \ signature_openssl { -DEFINES += XMLSEC_OPENSSL_110 -INCLUDEPATH += $$CORE_ROOT_DIR/Common/3dParty/openssl/openssl/include - -LIBS += -L$$CORE_ROOT_DIR/Common/3dParty/openssl/openssl -lssl -LIBS += -L$$CORE_ROOT_DIR/Common/3dParty/openssl/openssl -lcrypto +include(../../../Common/3dParty/openssl/openssl.pri) }