From 55766a4b7a112761c9e19538f93b6548398ea39e Mon Sep 17 00:00:00 2001 From: Vladimir Gorshenkov Date: Mon, 19 Apr 2021 14:14:11 +0300 Subject: [PATCH] [3dParty][websocket] fix include/lib openssl --- Common/3dParty/ixwebsocket/ixwebsocket.pri | 6 ++++-- Common/kernel.pro | 8 +++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Common/3dParty/ixwebsocket/ixwebsocket.pri b/Common/3dParty/ixwebsocket/ixwebsocket.pri index 7c8099f2b2..bcb6be041e 100644 --- a/Common/3dParty/ixwebsocket/ixwebsocket.pri +++ b/Common/3dParty/ixwebsocket/ixwebsocket.pri @@ -18,7 +18,6 @@ core_android { core_ios { INCLUDEPATH += \ - $$PWD/../ixwebsocket/IXWebSocket/build/ios/ixwebsocket-universal/include \ LIBS += \ $$PWD/../openssl/build/ios/openssl-universal/lib/libcrypto.a \ @@ -31,8 +30,11 @@ core_linux { INCLUDEPATH += \ $$PWD/../ixwebsocket/IXWebSocket/build/linux_64/include \ - + LIBS += $$PWD/../ixwebsocket/IXWebSocket/build/linux_64/lib/libixwebsocket.a + LIBS += $$PWD/../openssl/build/linux_64/lib/libssl.a + LIBS += $$PWD/../openssl/build/linux_64/lib/libcrypto.a + } core_mac { diff --git a/Common/kernel.pro b/Common/kernel.pro index 9806b85bf3..77e68c4cb1 100644 --- a/Common/kernel.pro +++ b/Common/kernel.pro @@ -30,10 +30,7 @@ include(../Common/WebSocket/websocket.pri) ixwebsocket { - DEFINES += USE_IXWEBSOCKET - - include(../Common/3dParty/ixwebsocket/ixwebsocket.pri) - include(../Common/3dParty/openssl/openssl.pri) + DEFINES += USE_IXWEBSOCKET HEADERS += \ ./WebSocket/websocket.h \ @@ -43,7 +40,8 @@ ixwebsocket { SOURCES += \ ./WebSocket/ixwebsocket_internal.cpp \ ./WebSocket/managerWebSocket.cpp \ - + + include(../Common/3dParty/ixwebsocket/ixwebsocket.pri) } socketrocket {