diff --git a/Common/3dParty/ixwebsocket/ixwebsocket.pri b/Common/3dParty/ixwebsocket/ixwebsocket.pri index c3082e9b87..68d3cbba82 100644 --- a/Common/3dParty/ixwebsocket/ixwebsocket.pri +++ b/Common/3dParty/ixwebsocket/ixwebsocket.pri @@ -14,3 +14,15 @@ core_android { LIBS += \ $$PWD/../ixwebsocket/IXWebSocket/build/$$ABI_PATH/lib/libixwebsocket.a \ } + +core_ios { + + INCLUDEPATH += \ + $$PWD/../ixwebsocket/IXWebSocket/build/ios/ixwebsocket-universal/include \ + + LIBS += \ + $$PWD/../openssl/ios/build/openssl-universal/lib/libcrypto.a \ + $$PWD/../openssl/ios/build/openssl-universal/lib/libssl.a \ + $$PWD/../ixwebsocket/IXWebSocket/build/ios/ixwebsocket-universal/lib/libixwebsocket.a \ + +} diff --git a/Common/3dParty/openssl/build-ios-common.sh b/Common/3dParty/openssl/build-ios-common.sh index 437a97c322..c073b70cd1 100755 --- a/Common/3dParty/openssl/build-ios-common.sh +++ b/Common/3dParty/openssl/build-ios-common.sh @@ -17,17 +17,17 @@ source ./build-common.sh export PLATFORM_TYPE="iOS" -export IOS_MIN_TARGET="8.0" -export ARCHS=("armv7" "arm64" "arm64e" "x86_64") -export SDKS=("iphoneos" "iphoneos" "iphoneos" "iphonesimulator") -export PLATFORMS=("iPhoneOS" "iPhoneOS" "iphoneos" "iPhoneSimulator") +export IOS_MIN_TARGET="10.0" +export ARCHS=("armv7" "arm64" "i386" "x86_64") +export SDKS=("iphoneos" "iphoneos" "iphonesimulator" "iphonesimulator") +export PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator") # for test !!! # export ARCHS=("armv7") # export SDKS=("iphoneos") # export PLATFORMS=("iPhoneOS") -function get_android_arch() { +function get_ios_arch() { local common_arch=$1 case ${common_arch} in armv7) @@ -39,8 +39,8 @@ function get_android_arch() { arm64e) echo "arm64e" ;; - x86) - echo "x86" + i386) + echo "i386" ;; x86_64) echo "x86-64" @@ -49,7 +49,7 @@ function get_android_arch() { } function ios_get_build_host() { - local arch=$(get_android_arch $1) + local arch=$(get_ios_arch $1) case ${arch} in armv7) echo "armv7-ios-darwin" @@ -60,7 +60,7 @@ function ios_get_build_host() { arm64e) echo "aarch64-ios-darwin" ;; - x86) + i386) echo "x86-ios-darwin" ;; x86-64) @@ -69,9 +69,9 @@ function ios_get_build_host() { esac } -function set_android_cpu_feature() { +function set_ios_cpu_feature() { local name=$1 - local arch=$(get_android_arch $2) + local arch=$(get_ios_arch $2) local ios_min_target=$3 local sysroot=$4 case ${arch} in @@ -80,14 +80,14 @@ function set_android_cpu_feature() { export CXX="xcrun -sdk iphoneos clang++ -arch armv7" export CFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" export LDFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib " - export CXXFLAGS="-std=c++14 -arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" + export CXXFLAGS="-std=c++11 -arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" ;; arm64) export CC="xcrun -sdk iphoneos clang -arch arm64" export CXX="xcrun -sdk iphoneos clang++ -arch arm64" export CFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" export LDFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib " - export CXXFLAGS="-std=c++14 -arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" + export CXXFLAGS="-std=c++11 -arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" ;; arm64e) # -march=armv8.3 ??? @@ -95,21 +95,21 @@ function set_android_cpu_feature() { export CXX="xcrun -sdk iphoneos clang++ -arch arm64e" export CFLAGS="-arch arm64e -target aarch64-ios-darwin -Wno-unused-function -fstrict-aliasing -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" export LDFLAGS="-arch arm64e -target aarch64-ios-darwin -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib " - export CXXFLAGS="-std=c++14 -arch arm64e -target aarch64-ios-darwin -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" + export CXXFLAGS="-std=c++11 -arch arm64e -target aarch64-ios-darwin -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include" ;; - x86) - export CC="xcrun -sdk iphonesimulator clang -arch x86" - export CXX="xcrun -sdk iphonesimulator clang++ -arch x86" - export CFLAGS="-arch x86 -target x86-ios-darwin -march=i386 -msse4.2 -mpopcnt -m64 -mtune=intel -Wno-unused-function -fstrict-aliasing -O2 -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" - export LDFLAGS="-arch x86 -target x86-ios-darwin -march=i386 -isysroot ${sysroot} -L${sysroot}/usr/lib " - export CXXFLAGS="-std=c++14 -arch x86 -target x86-ios-darwin -march=i386 -msse4.2 -mpopcnt -m64 -mtune=intel -fstrict-aliasing -DIOS -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" + i386) + export CC="xcrun -sdk iphonesimulator clang -arch i386" + export CXX="xcrun -sdk iphonesimulator clang++ -arch i386" + export CFLAGS="-arch i386 -target x86-ios-darwin -march=i386 -msse4.2 -mpopcnt -m64 -mtune=intel -Wno-unused-function -fstrict-aliasing -O2 -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" + export LDFLAGS="-arch i386 -target x86-ios-darwin -march=i386 -isysroot ${sysroot} -L${sysroot}/usr/lib " + export CXXFLAGS="-std=c++11 -arch i386 -target x86-ios-darwin -march=i386 -msse4.2 -mpopcnt -m64 -mtune=intel -fstrict-aliasing -DIOS -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" ;; x86-64) export CC="xcrun -sdk iphonesimulator clang -arch x86_64" export CXX="xcrun -sdk iphonesimulator clang++ -arch x86_64" export CFLAGS="-arch x86_64 -target x86_64-ios-darwin -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -Wno-unused-function -fstrict-aliasing -O2 -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" export LDFLAGS="-arch x86_64 -target x86_64-ios-darwin -march=x86-64 -isysroot ${sysroot} -L${sysroot}/usr/lib " - export CXXFLAGS="-std=c++14 -arch x86_64 -target x86_64-ios-darwin -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -fstrict-aliasing -DIOS -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" + export CXXFLAGS="-std=c++11 -arch x86_64 -target x86_64-ios-darwin -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -fstrict-aliasing -DIOS -mios-simulator-version-min=${ios_min_target} -I${sysroot}/usr/include" ;; *) log_error "not support" && exit 1 diff --git a/Common/3dParty/openssl/build-ios-openssl.sh b/Common/3dParty/openssl/build-ios-openssl.sh index 6e877385cf..d067756314 100755 --- a/Common/3dParty/openssl/build-ios-openssl.sh +++ b/Common/3dParty/openssl/build-ios-openssl.sh @@ -37,7 +37,7 @@ echo TOOLS_ROOT=${TOOLS_ROOT} # openssl-1.1.1d has fix configure bug LIB_VERSION="OpenSSL_1_1_1d" LIB_NAME="openssl-1.1.1d" -LIB_DEST_DIR="${pwd_path}/../output/ios/openssl-universal" +LIB_DEST_DIR="${pwd_path}/ios/build/openssl-universal/lib" init_log_color @@ -74,16 +74,16 @@ function configure_make() { exit -1 fi - PREFIX_DIR="${pwd_path}/../output/ios/openssl-${ARCH}" + PREFIX_DIR="${pwd_path}/ios/build/${ARCH}" if [ -d "${PREFIX_DIR}" ]; then rm -fr "${PREFIX_DIR}" fi mkdir -p "${PREFIX_DIR}" - OUTPUT_ROOT=${TOOLS_ROOT}/../output/ios/openssl-${ARCH} + OUTPUT_ROOT=${TOOLS_ROOT}/ios/${ARCH} mkdir -p ${OUTPUT_ROOT}/log - set_android_cpu_feature "nghttp2" "${ARCH}" "${IOS_MIN_TARGET}" "${CROSS_TOP}/SDKs/${CROSS_SDK}" + set_ios_cpu_feature "nghttp2" "${ARCH}" "${IOS_MIN_TARGET}" "${CROSS_TOP}/SDKs/${CROSS_SDK}" ios_printf_global_params "$ARCH" "$SDK" "$PLATFORM" "$PREFIX_DIR" "$OUTPUT_ROOT" @@ -97,19 +97,19 @@ function configure_make() { elif [[ "${ARCH}" == "armv7" ]]; then # openssl1.1.1d can be set normally, 1.1.0f does not take effect - ./Configure iphoneos-cross no-shared --prefix="${PREFIX_DIR}" + ./Configure iphoneos-cross no-shared --prefix="${PREFIX_DIR}" enable-ssl3 enable-ssl3-method sed -ie "s!-fno-common!-fno-common -fembed-bitcode !" "Makefile" elif [[ "${ARCH}" == "arm64" ]]; then # openssl1.1.1d can be set normally, 1.1.0f does not take effect - ./Configure iphoneos-cross no-shared --prefix="${PREFIX_DIR}" + ./Configure iphoneos-cross no-shared --prefix="${PREFIX_DIR}" enable-ssl3 enable-ssl3-method sed -ie "s!-fno-common!-fno-common -fembed-bitcode !" "Makefile" - elif [[ "${ARCH}" == "arm64e" ]]; then + elif [[ "${ARCH}" == "i386" ]]; then # openssl1.1.1d can be set normally, 1.1.0f does not take effect - ./Configure iphoneos-cross no-shared --prefix="${PREFIX_DIR}" + ./Configure darwin-i386-cc no-shared --prefix="${PREFIX_DIR}" enable-ssl3 enable-ssl3-method sed -ie "s!-fno-common!-fno-common -fembed-bitcode !" "Makefile" else @@ -131,6 +131,7 @@ log_info "${PLATFORM_TYPE} ${LIB_NAME} start..." for ((i = 0; i < ${#ARCHS[@]}; i++)); do if [[ $# -eq 0 || "$1" == "${ARCHS[i]}" ]]; then + log_info "configure_make ${ARCHS[i]}" "${SDKS[i]}" "${PLATFORMS[i]}" configure_make "${ARCHS[i]}" "${SDKS[i]}" "${PLATFORMS[i]}" fi done @@ -140,12 +141,26 @@ log_info "lipo start..." function lipo_library() { LIB_SRC=$1 LIB_DST=$2 - LIB_PATHS=("${ARCHS[@]/#/${pwd_path}/../output/ios/openssl-}") + LIB_PATHS=("${ARCHS[@]/#/${pwd_path}/ios/build/}") LIB_PATHS=("${LIB_PATHS[@]/%//lib/${LIB_SRC}}") lipo ${LIB_PATHS[@]} -create -output "${LIB_DST}" } +function copy_include() { + DST=$1 + if [ -d "${pwd_path}/ios/build/x86_64/include" ]; then + cp -r "${pwd_path}/ios/build/x86_64/include" "${DST}" + elif [ -d "${pwd_path}/ios/build/armv7/include" ]; then + cp -r "${pwd_path}/ios/build/armv7/include" "${DST}" + elif [ -d "${pwd_path}/ios/build/arm64/include" ]; then + cp -r "${pwd_path}/ios/build/arm64/include" "${DST}" + elif [ -d "${pwd_path}/ios/build/i386/include" ]; then + cp -r "${pwd_path}/ios/build/i386/include" "${DST}" + fi +} + mkdir -p "${LIB_DEST_DIR}" -lipo_library "libcrypto.a" "${LIB_DEST_DIR}/libcrypto-universal.a" -lipo_library "libssl.a" "${LIB_DEST_DIR}/libssl-universal.a" +lipo_library "libcrypto.a" "${LIB_DEST_DIR}/libcrypto.a" +lipo_library "libssl.a" "${LIB_DEST_DIR}/libssl.a" +copy_include "${LIB_DEST_DIR}/../" log_info "${PLATFORM_TYPE} ${LIB_NAME} end..." diff --git a/Common/3dParty/socketRocket/socketRocket.pri b/Common/3dParty/socketRocket/socketRocket.pri index 1e5d71f39f..9f6439458f 100644 --- a/Common/3dParty/socketRocket/socketRocket.pri +++ b/Common/3dParty/socketRocket/socketRocket.pri @@ -1,8 +1,8 @@ core_ios { INCLUDEPATH += \ - $$PWD/../socketRocket \ + $$PWD/../socketrocket \ LIBS += \ - $$PWD/../socketRocket/build/lib/ios/libSoсketRocket.a \ + $$PWD/../socketrocket/build/lib/ios/libSoсketRocket.a \ } diff --git a/Common/WebSocket/socketRocket_internal.mm b/Common/WebSocket/socketRocket_internal.mm index 54d65b883c..d11c6c927d 100644 --- a/Common/WebSocket/socketRocket_internal.mm +++ b/Common/WebSocket/socketRocket_internal.mm @@ -1,4 +1,4 @@ - * (c) Copyright Ascensio System SIA 2010-2021 + /* (c) Copyright Ascensio System SIA 2010-2021 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -40,7 +40,7 @@ namespace NSWebSocket SocketRocketObjC* wrapped; }; - CSocketRocket::CSocketRocket(): CWebWorkerBase(url, listener) + CSocketRocket::CSocketRocket(const std::string& url, std::shared_ptr listener): CWebWorkerBase(url, listener) { impl = new SocketRocketImpl(); impl->wrapped = [[SocketRocketObjC alloc] init]; diff --git a/Common/WebSocket/socketRocket_objc.h b/Common/WebSocket/socketRocket_objc.h index 73c8f1b48a..b7135e400e 100644 --- a/Common/WebSocket/socketRocket_objc.h +++ b/Common/WebSocket/socketRocket_objc.h @@ -36,25 +36,23 @@ #import #include "websocket.h" -namespace NSWebSocket + +@interface SocketRocketObjC: NSObject { - - @interface SocketRocketObjC: NSObject - { - IListener* m_listener; - NSString* m_url; - } - - @property (strong, nonatomic) SRWebSocket *socket; - - - - (void) open; - - (void) send : (NSString *)name; - - (void) close; - - (void) setListener: (IListener *)listener; - - (void) setUrl: (NSString *)url; - - @end - + NSWebSocket::IListener* m_listener; + NSString* m_url; } + +@property (strong, nonatomic) SRWebSocket *socket; + + +- (void) open; +- (void) send : (NSString *)name; +- (void) close; +- (void) setListener: (NSWebSocket::IListener *)listener; +- (void) setUrl: (NSString *)url; + +@end + + /* _SOCKET_ROCKET_OBJC_H_ */ diff --git a/Common/WebSocket/socketRocket_objc.mm b/Common/WebSocket/socketRocket_objc.mm index a2f04de427..5ab7cd766a 100644 --- a/Common/WebSocket/socketRocket_objc.mm +++ b/Common/WebSocket/socketRocket_objc.mm @@ -34,147 +34,142 @@ #import "socketRocket_objc.h" #import "../../DesktopEditor/Common/Mac/NSString+StringUtils.h" -namespace NSWebSocket +@implementation SocketRocketObjC + +- (id)init +{ + self = [super init]; + if (self) { + self.socket = nil; + m_listener = nil; + m_url = nil; + } + return self; +} + +- (void)open +{ + if (m_url && m_url.length) + { + NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:m_url]]; + if (request) + { + self.socket = [[SRWebSocket alloc] initWithURLRequest:request + protocols:nil + allowsUntrustedSSLCertificates:YES]; + self.socket.delegate = self; + [self.socket open]; + } + } +} + +- (void)send:(NSString*)message { - @implementation SocketRocketObjC - - - (id)init - { - self = [super init]; - if (self) { - self.socket = nil; - m_listener = nil; - m_url = nil; - } - return self; - } - - - (void)open - { - if (m_url && m_url.length) - { - NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:m_url]]; - if (request) - { - self.socket = [[SRWebSocket alloc] initWithURLRequest:request - protocols:nil - allowsUntrustedSSLCertificates:YES]; - self.socket.delegate = self; - [self.socket open]; - } - } - } - - - (void)send:(NSString*)message - { - - #if _LOGGER_SOCKETS - - NSLog(@"------------------- SEND TO SOCKET -------------------"); - NSLog(@"%@", message); - - #endif - - if (self.socket) - { - [self.socket send:message]; - - } - } - - - (void)close - { - if (self.socket) - { - [self.socket close]; - } - } - - - (void)setListener: (IListener*)listener - { - m_listener = listener; - } - - - (void)setUrl: (NSString *)url - { - m_url = url; - } - - #pragma mark - SRWebSocketDelegate - - - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message - { +#if _LOGGER_SOCKETS - #if _LOGGER_SOCKETS - - NSLog(@"------------------- SOCKET RECEIVE MESSAGE -------------------"); - NSLog(@"%@", message); - - #endif - NSString *s = (NSString *)message; - if (s) - { - m_listener->onMessage(s.stdstring); - } + NSLog(@"------------------- SEND TO SOCKET -------------------"); + NSLog(@"%@", message); + +#endif + + if (self.socket) + { + [self.socket send:message]; } - - - (void)webSocketDidOpen:(SRWebSocket *)webSocket - { - - m_listener->onOpen(); - #if _LOGGER_SOCKETS - - NSLog(@"------------------- SOCKET OPEN -------------------"); - // NSLog(@"URL : %@", webSocket.url); - // NSLog(@"description : %@", webSocket.description); - // NSLog(@"hash : %lu", (unsigned long)webSocket.hash); - // NSLog(@"---------------------------------------------------"); - - #endif - - } - - - (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error - { - m_listener->onError(error.localizedDescription.stdstring); - #if _LOGGER_SOCKETS - - NSLog(@"---------------------------------------------------------"); - NSLog(@"------------------- SOCKET ERROR : %@ ------------", error); - NSLog(@"---------------------------------------------------------"); - - #endif - } - - - (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean - { - - m_listener->onClose(code, reason.stdstring); - #if _LOGGER_SOCKETS - - NSLog(@"---------------------------------------------------------"); - NSLog(@"------------------- SOCKET CLOSE : %@ -----------", reason); - NSLog(@"---------------------------------------------------------"); - - #endif - } - - - (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload - { - - #if _LOGGER_SOCKETS - - NSString *str = [[NSString alloc] initWithData:pongPayload encoding:NSUTF8StringEncoding]; - - NSLog(@"---------------------------------------------------"); - NSLog(@"------------------- SOCKET PONG : %@ ---------", str); - NSLog(@"---------------------------------------------------"); - - #endif - } - - @end - } + +- (void)close +{ + if (self.socket) + { + [self.socket close]; + } +} + +- (void)setListener: (NSWebSocket::IListener*)listener +{ + m_listener = listener; +} + +- (void)setUrl: (NSString *)url +{ + m_url = url; +} + +#pragma mark - SRWebSocketDelegate + +- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message +{ + +#if _LOGGER_SOCKETS + + NSLog(@"------------------- SOCKET RECEIVE MESSAGE -------------------"); + NSLog(@"%@", message); + +#endif + NSString *s = (NSString *)message; + if (s) + { + m_listener->onMessage(s.stdstring); + } + +} + +- (void)webSocketDidOpen:(SRWebSocket *)webSocket +{ + + m_listener->onOpen(); +#if _LOGGER_SOCKETS + + NSLog(@"------------------- SOCKET OPEN -------------------"); + // NSLog(@"URL : %@", webSocket.url); + // NSLog(@"description : %@", webSocket.description); + // NSLog(@"hash : %lu", (unsigned long)webSocket.hash); + // NSLog(@"---------------------------------------------------"); + +#endif + +} + +- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error +{ + m_listener->onError(error.localizedDescription.stdstring); +#if _LOGGER_SOCKETS + + NSLog(@"---------------------------------------------------------"); + NSLog(@"------------------- SOCKET ERROR : %@ ------------", error); + NSLog(@"---------------------------------------------------------"); + +#endif +} + +- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean +{ + + m_listener->onClose(code, reason.stdstring); +#if _LOGGER_SOCKETS + + NSLog(@"---------------------------------------------------------"); + NSLog(@"------------------- SOCKET CLOSE : %@ -----------", reason); + NSLog(@"---------------------------------------------------------"); + +#endif +} + +- (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload +{ + +#if _LOGGER_SOCKETS + + NSString *str = [[NSString alloc] initWithData:pongPayload encoding:NSUTF8StringEncoding]; + + NSLog(@"---------------------------------------------------"); + NSLog(@"------------------- SOCKET PONG : %@ ---------", str); + NSLog(@"---------------------------------------------------"); + +#endif +} + +@end diff --git a/Common/kernel.pro b/Common/kernel.pro index c31b3e116c..8e674930a5 100644 --- a/Common/kernel.pro +++ b/Common/kernel.pro @@ -69,20 +69,33 @@ core_ios { LIBS += -framework Foundation - DEFINES += USE_SOCKETROCKET + #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/socketRocket_objc.h \ - ./WebSocket/socketRocket_internal.h \ + ./WebSocket/ixwebsocket_internal.h \ - OBJECTIVE_SOURCES += \ - ./WebSocket/socketRocket_objc.mm \ - ./WebSocket/socketRocket_internal.mm \ + SOURCES += \ + ./WebSocket/ixwebsocket_internal.cpp \ ./WebSocket/managerWebSocket.cpp \ - include(../Common/3dParty/socketRocket/socketRocket.pri) + include(../Common/3dParty/ixwebsocket/ixwebsocket.pri) } core_android {