pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[3dParty][websocket] fix includes 2

Browse Source
This commit is contained in:
Vladimir Gorshenkov
2021-04-16 01:24:24 +03:00
parent 7cbfe8eea4
commit e18873cfa6
6 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
Common/kernel.pro
View File

@ -25,6 +25,47 @@ include(../OfficeUtils/OfficeUtils.pri)
CONFIG += core_static_link_xml_full
include(../DesktopEditor/xml/build/qt/libxml2.pri)
# WEBSOCKET
include(../Common/WebSocket/websocket.pri)
ixwebsocket {
DEFINES += USE_IXWEBSOCKET
include(../Common/3dParty/ixwebsocket/ixwebsocket.pri)
include(../Common/3dParty/openssl/openssl.pri)
HEADERS += \
./WebSocket/websocket.h \
./WebSocket/WebWorkerBase.h \
./WebSocket/ixwebsocket_internal.h \
SOURCES += \
./WebSocket/ixwebsocket_internal.cpp \
./WebSocket/managerWebSocket.cpp \
}
socketrocket {
DEFINES += USE_SOCKETROCKET
include(../Common/3dParty/socketrocket/socketrocket.pri)
HEADERS += \
./WebSocket/websocket.h \
./WebSocket/WebWorkerBase.h \
./WebSocket/socketRocket_objc.h \
./WebSocket/socketRocket_internal.h \
OBJECTIVE_SOURCES += \
./WebSocket/socketRocket_objc.mm \
./WebSocket/socketRocket_internal.mm \
./WebSocket/managerWebSocket.cpp \
}
# DOWNLOADER
HEADERS += \
./FileDownloader/FileDownloader.h \
@ -69,59 +110,18 @@ core_ios {
LIBS += -framework Foundation
#DEFINES += USE_SOCKETROCKET
# HEADERS += \
# ./WebSocket/websocket.h \
# ./WebSocket/WebWorkerBase.h \
# ./WebSocket/socketRocket_objc.h \
# ./WebSocket/socketRocket_internal.h \
#OBJECTIVE_SOURCES += \
# ./WebSocket/socketRocket_objc.mm \
# ./WebSocket/socketRocket_internal.mm \
# ./WebSocket/managerWebSocket.cpp \
# include(../Common/3dParty/socketRocket/socketRocket.pri)
DEFINES += USE_IXWEBSOCKET
HEADERS += \
./WebSocket/websocket.h \
./WebSocket/WebWorkerBase.h \
./WebSocket/ixwebsocket_internal.h \
SOURCES += \
./WebSocket/ixwebsocket_internal.cpp \
./WebSocket/managerWebSocket.cpp \
include(../Common/3dParty/ixwebsocket/ixwebsocket.pri)
}
core_android {
DEFINES += USE_FILE32API
SOURCES += ./FileDownloader/FileDownloader_curl.cpp
use_external_download {
DEFINES += USE_EXTERNAL_DOWNLOAD
} else {
include(../Common/3dParty/curl/curl.pri)
}
DEFINES += USE_IXWEBSOCKET
HEADERS += \
./WebSocket/websocket.h \
./WebSocket/WebWorkerBase.h \
./WebSocket/ixwebsocket_internal.h \
SOURCES += \
./WebSocket/ixwebsocket_internal.cpp \
./WebSocket/managerWebSocket.cpp \
include(../Common/3dParty/ixwebsocket/ixwebsocket.pri)
DEFINES += NOT_USE_PTHREAD_CANCEL
}