This commit is contained in:
Alexey Golubev
2018-05-24 15:34:46 +03:00
6 changed files with 22 additions and 12 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -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
}

View File

@ -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
}