From 0e4f194269882bdab8ca956431fbb5c40aad8bd8 Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Fri, 22 Oct 2021 12:03:17 +0300 Subject: [PATCH] Fix ios build --- Common/3dParty/ixwebsocket/ixwebsocket.pri | 4 +++- Common/Network/FileTransporter/filetransporter.pri | 3 +-- Common/Network/network.pro | 2 ++ Common/kernel.pro | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Common/3dParty/ixwebsocket/ixwebsocket.pri b/Common/3dParty/ixwebsocket/ixwebsocket.pri index 2110309e91..f4657c7656 100644 --- a/Common/3dParty/ixwebsocket/ixwebsocket.pri +++ b/Common/3dParty/ixwebsocket/ixwebsocket.pri @@ -21,9 +21,11 @@ core_android { core_ios { - INCLUDEPATH += $$PWD/IXWebSocket/build/ios/openssl-universal/include + INCLUDEPATH += $$PWD/IXWebSocket/build/ios/ixwebsocket-universal/include LIBS += $$PWD/IXWebSocket/build/ios/ixwebsocket-universal/lib/libixwebsocket.a + OPENSSL_LIBS_DIRECTORY = $$PWD/../openssl/build/ios/openssl-universal/lib + } core_linux { diff --git a/Common/Network/FileTransporter/filetransporter.pri b/Common/Network/FileTransporter/filetransporter.pri index f38753dce2..228f705fa6 100644 --- a/Common/Network/FileTransporter/filetransporter.pri +++ b/Common/Network/FileTransporter/filetransporter.pri @@ -30,8 +30,7 @@ core_mac { core_ios { OBJECTIVE_SOURCES += \ - $$PWD/src/FileTransporter_mac.mm \ - $$PWD/../../../DesktopEditor/common/File_ios.mm + $$PWD/src/FileTransporter_mac.mm LIBS += -framework Foundation } diff --git a/Common/Network/network.pro b/Common/Network/network.pro index 9bd264e65f..fe8cba8d17 100644 --- a/Common/Network/network.pro +++ b/Common/Network/network.pro @@ -3,6 +3,8 @@ TEMPLATE = lib CONFIG -= qt QT -= core gui + +CONFIG += shared CONFIG += plugin CORE_ROOT_DIR = $$PWD/../../../core diff --git a/Common/kernel.pro b/Common/kernel.pro index cad869b47f..bb680d9f56 100644 --- a/Common/kernel.pro +++ b/Common/kernel.pro @@ -89,3 +89,8 @@ core_windows { LIBS += -lRpcrt4 LIBS += -lShell32 } + +core_ios { + OBJECTIVE_SOURCES += ./../DesktopEditor/common/File_ios.mm + LIBS += -framework Foundation +}