diff --git a/Common/Network/WebSocket/src/socketio/socketio_internal.cpp b/Common/Network/WebSocket/src/socketio/socketio_internal.cpp index f8bff1cf36..abbb092776 100644 --- a/Common/Network/WebSocket/src/socketio/socketio_internal.cpp +++ b/Common/Network/WebSocket/src/socketio/socketio_internal.cpp @@ -185,7 +185,8 @@ namespace NSNetwork //CTemporaryCS (&m_internal->m_oCS); // если json -то надо объект - if (0 == message_str.find("{")) + if (0 == message_str.find("{") || + 0 == message_str.find("[")) { sio::packet_manager manager; sio::message::ptr message; @@ -208,7 +209,8 @@ namespace NSNetwork void CIOWebSocket::close() { - CTemporaryCS (&m_internal->m_oCS); + //CTemporaryCS (&m_internal->m_oCS); + m_internal->m_socket.socket()->off_all(); m_internal->m_socket.close(); } diff --git a/Common/base.pri b/Common/base.pri index e1eae17640..f5136ad6b5 100644 --- a/Common/base.pri +++ b/Common/base.pri @@ -337,6 +337,7 @@ core_android { } core_debug { + DEFINES += _DEBUG CORE_BUILDS_CONFIGURATION_PREFIX = debug } core_release { diff --git a/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro b/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro index 8772c69b1d..f930799fb6 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro +++ b/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro @@ -23,23 +23,15 @@ DEFINES += UNICODE \ _UNICODE \ DONT_WRITE_EMBEDDED_FONTS -CONFIG(debug, debug|release){ - -message(Debug) -DEFINES += _DEBUG -} - -core_mac { -LIBS += $$DESTDIR -lUnicodeConverter -} - INCLUDEPATH += ../../../XlsFile/Format INCLUDEPATH += ../../../Common INCLUDEPATH += ../../../../OOXML/XlsbFormat -CONFIG += precompile_header -PRECOMPILED_HEADER = precompiled.h -HEADERS += precompiled.h +!disable_precompiled_header:CONFIG += precompile_header +precompile_header { + PRECOMPILED_HEADER = precompiled.h + HEADERS += precompiled.h +} core_release { SOURCES += \ diff --git a/OOXML/Projects/Linux/BinDocument/BinDocument.pro b/OOXML/Projects/Linux/BinDocument/BinDocument.pro index a448adcaae..cea7625a61 100644 --- a/OOXML/Projects/Linux/BinDocument/BinDocument.pro +++ b/OOXML/Projects/Linux/BinDocument/BinDocument.pro @@ -25,9 +25,11 @@ DEFINES += UNICODE \ DONT_WRITE_EMBEDDED_FONTS \ AVS_USE_CONVERT_PPTX_TOCUSTOM_VML -CONFIG += precompile_header -PRECOMPILED_HEADER = precompiled.h -HEADERS += precompiled.h +!disable_precompiled_header:CONFIG += precompile_header +precompile_header { + PRECOMPILED_HEADER = precompiled.h + HEADERS += precompiled.h +} SOURCES += \ ../../../Binary/Document/DocWrapper/DocxSerializer.cpp \ diff --git a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro index 787e7c0dc0..8177b1c4da 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro +++ b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro @@ -22,9 +22,11 @@ DEFINES += UNICODE _UNICODE \ #BOOST include($$PWD/../../../../Common/3dParty/boost/boost.pri) -CONFIG += precompile_header -PRECOMPILED_HEADER = precompiled.h -HEADERS += precompiled.h +!disable_precompiled_header:CONFIG += precompile_header +precompile_header { + PRECOMPILED_HEADER = precompiled.h + HEADERS += precompiled.h +} core_release { SOURCES += \ diff --git a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro index 62383ce503..1ce73e3036 100644 --- a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro +++ b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro @@ -38,9 +38,11 @@ SOURCES += \ pptx_format_logic.cpp } -#CONFIG += precompile_header -#PRECOMPILED_HEADER = precompiled.h -#HEADERS += precompiled.h +#!disable_precompiled_header:CONFIG += precompile_header +#precompile_header { +# PRECOMPILED_HEADER = precompiled.h +# HEADERS += precompiled.h +#} core_debug { SOURCES += \ diff --git a/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro b/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro index ce14bcea2b..98f6b566ba 100644 --- a/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro +++ b/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro @@ -22,9 +22,11 @@ DEFINES += DONT_WRITE_EMBEDDED_FONTS #BOOST include($$PWD/../../../../Common/3dParty/boost/boost.pri) -CONFIG += precompile_header -PRECOMPILED_HEADER = precompiled.h -HEADERS += precompiled.h +!disable_precompiled_header:CONFIG += precompile_header +precompile_header { + PRECOMPILED_HEADER = precompiled.h + HEADERS += precompiled.h +} core_release { SOURCES += \ diff --git a/OdfFile/Projects/Linux/OdfFormatLib.pro b/OdfFile/Projects/Linux/OdfFormatLib.pro index 23c6dbb7a0..59f094e6b4 100644 --- a/OdfFile/Projects/Linux/OdfFormatLib.pro +++ b/OdfFile/Projects/Linux/OdfFormatLib.pro @@ -25,14 +25,12 @@ DEFINES += UNICODE \ INCLUDEPATH += ../../Common -CONFIG(debug, debug|release){ -DEFINES += _DEBUG +!disable_precompiled_header:CONFIG += precompile_header +precompile_header { + PRECOMPILED_HEADER = precompiled.h + HEADERS += precompiled.h } -CONFIG += precompile_header -PRECOMPILED_HEADER = precompiled.h -HEADERS += precompiled.h - core_release { SOURCES += \ odf_converter.cpp \