сборка x2t для windows чтобы заменить конвертацию com dll и c# exe

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63748 954022d7-b5bf-4e40-9824-e11837661b57

ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro

@@ -9,14 +9,52 @@ QT       -= core gui
 TARGET = ASCHTMLRendererLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
 DEFINES +=  UNICODE \
             _UNICODE \
-            _LINUX_QT \
             NODOCX \
             DESKTOP_EDITOR_GRAPHICS
 
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+}
+#################### LINUX ########################
+
 INCLUDEPATH += \
     ../../DesktopEditor/freetype-2.5.2/include \
     ../../DesktopEditor/agg-2.4/include

ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro

@@ -9,11 +9,40 @@ QT       -= core gui
 TARGET = DocFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
+
 DEFINES +=  UNICODE \
         _UNICODE \
-         LINUX \
-        _LINUX_QT\
         _USE_XMLLITE_READER_ \
          USE_LITE_READER \
          USE_ATL_CSTRING \
@@ -21,13 +50,25 @@ DEFINES +=  UNICODE \
         LIBXML_READER_ENABLED
 
 
-INCLUDEPATH += \
-    ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
 
-INCLUDEPATH += \
-    /usr/include/libxml2
+INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
 
-LIBS += -lxml2
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 SOURCES +=  \
     ../DocFormatLib.cpp \

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -9,12 +9,41 @@ QT       -= core gui
 TARGET = ASCOfficeDocxFile2Lib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++0x -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
+
 DEFINES += UNICODE \
 	_UNICODE \
-        _LINUX \
-        _LINUX_QT \
-        LINUX \
         NODOCX \
 	_USE_XMLLITE_READER_ \
 	USE_LITE_READER \
@@ -26,14 +55,25 @@ DEFINES += UNICODE \
 	LIBXML_READER_ENABLED
 
 INCLUDEPATH += \
-    ../../DesktopEditor/freetype-2.5.2/include \
-    ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+    ../../DesktopEditor/freetype-2.5.2/include
 
-INCLUDEPATH += \
-    /usr/include/libxml2
+#################### WINDOWS #####################
+win32 {
+INCLUDEPATH += ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
-LIBS += -lxml2
-	
 SOURCES += ../DocWrapper/DocxSerializer.cpp \
     ../DocWrapper/FontProcessor.cpp \
     ../DocWrapper/XlsxSerializer.cpp \

ASCOfficeOdfFile/include/cpdoccore/CPOptional.h

 #pragma once
 
+#include <boost/optional/optional_io.hpp>
 #include <boost/optional.hpp>
 
 namespace cpdoccore

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -10,23 +10,70 @@ TARGET = OdfFileReaderLib
 TEMPLATE = lib
 CONFIG += staticlib
 
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
 DEFINES +=  UNICODE \
             _UNICODE \
-            _LINUX_QT \
-            LINUX \
             _USE_LIBXML2_READER_ \
             _USE_XMLLITE_READER_ \
             USE_LITE_READER
 
-INCLUDEPATH += /usr/include/libxml2
 INCLUDEPATH += ../include
 INCLUDEPATH += ../../../ServerComponents/DesktopEditor/freetype-2.5.2/include
 
 CONFIG(debug, debug|release){
 DEFINES +=  _DEBUG
 }
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
+
+INCLUDEPATH += ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+INCLUDEPATH += C:/boost_1_58_0
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 SOURCES += \
     ../formulasconvert/formulasconvert_odf.cpp \

ASCOfficeOdfFile/src/common/CPColorUtils.cpp

@@ -3,6 +3,7 @@
 #include <boost/foreach.hpp>
 #include <cmath>
 
+#include <boost/optional/optional_io.hpp>
 #include <boost/optional.hpp>
 #include <boost/lexical_cast.hpp>
 

ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro

@@ -10,21 +10,68 @@ TARGET = OdfFileWriterLib
 TEMPLATE = lib
 CONFIG += staticlib
 
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
 DEFINES +=  UNICODE \
             _UNICODE \
-            _LINUX_QT \
-            LINUX \
             _USE_LIBXML2_READER_ \
             _USE_XMLLITE_READER_ \
             USE_LITE_READER
 
-INCLUDEPATH += /usr/include/libxml2
 INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
 INCLUDEPATH += ../../ASCOfficeOdfFile/include
 INCLUDEPATH += ../../ASCOfficeOdfFile/src/odf/datatypes
 
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
+
+INCLUDEPATH += ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+INCLUDEPATH += C:/boost_1_58_0
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 CONFIG(debug, debug|release){
 DEFINES +=  _DEBUG

ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro

@@ -9,11 +9,39 @@ QT       -= core gui
 TARGET = PptFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 DEFINES +=  UNICODE \
         _UNICODE \
-         LINUX \
-        _LINUX_QT\
          USE_ATL_CSTRING \
         PPTX_DEF \
         PPT_DEF \
@@ -31,16 +59,28 @@ DEFINES +=  UNICODE \
 
 
 INCLUDEPATH += \
-    ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+    ../../../DesktopEditor/freetype-2.5.2/include
 
-INCLUDEPATH += \
-    /usr/include/libxml2 \
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
 
-INCLUDEPATH += \
-    ../../../DesktopEditor/freetype-2.5.2/include
+INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3
+INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
 
-LIBS += -lxml2
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
 
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 unix {
     target.path = /usr/lib

ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.h

@@ -269,27 +269,27 @@ public:
 		pHeader->Checksum			^= (pHeader->Reserved & 0x0000FFFFL);
 		pHeader->Checksum			^= ((pHeader->Reserved & 0xFFFF0000L) >> 16);
 	}
-
-	static void DecompressDeflate(BYTE* pSrc, LONG lSrcSize, BYTE** ppDst, LONG& lDstSize)
-	{
-#if defined(_WIN32) || defined (_WIN64)
-        CComPtr<IEncodingFilterFactory> pEFF;
-		HRESULT hr = pEFF.CoCreateInstance(CLSID_StdEncodingFilterFac);
-		CComPtr<IDataFilter> pDF;
-		//accquire suitable filter
-		if (!pEFF || FAILED(pEFF->GetDefaultFilter( L"deflate", L"text", &pDF))) 
-			return;
-
-		//temporary out buffers
-		BYTE* outBuff = new BYTE[200000];
-		DWORD dwOutBuffSize = sizeof(outBuff);
-
-		long dwRead = 0, dwWritten = 0;
-		//encode chunk of data
-		//hr = pDF->DoDecode(0, lSrcSize, pSrc, lDstSize, *ppDst, lSrcSize, &dwRead, &dwWritten, 0);
-		hr = pDF->DoDecode(0, lSrcSize, pSrc, dwOutBuffSize, outBuff, lSrcSize, &dwRead, &dwWritten, 0);
-#endif
-	}
+// 
+//	static void DecompressDeflate(BYTE* pSrc, LONG lSrcSize, BYTE** ppDst, LONG& lDstSize)
+//	{
+//#if defined(_WIN32) || defined (_WIN64)
+//        CComPtr<IEncodingFilterFactory> pEFF;
+//		HRESULT hr = pEFF.CoCreateInstance(CLSID_StdEncodingFilterFac);
+//		CComPtr<IDataFilter> pDF;
+//		//accquire suitable filter
+//		if (!pEFF || FAILED(pEFF->GetDefaultFilter( L"deflate", L"text", &pDF)))
+//			return;
+
+//		//temporary out buffers
+//		BYTE* outBuff = new BYTE[200000];
+//		DWORD dwOutBuffSize = sizeof(outBuff);
+
+//		long dwRead = 0, dwWritten = 0;
+//		//encode chunk of data
+//		//hr = pDF->DoDecode(0, lSrcSize, pSrc, lDstSize, *ppDst, lSrcSize, &dwRead, &dwWritten, 0);
+//		hr = pDF->DoDecode(0, lSrcSize, pSrc, dwOutBuffSize, outBuff, lSrcSize, &dwRead, &dwWritten, 0);
+//#endif
+//	}
 };
 
 class CMetaFileBuffer

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -25,13 +25,6 @@ using namespace NSFontCutter;
 #include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 #include <list>
 
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
-
 namespace NSShapeImageGen
 {
 	const long c_nMaxImageSize = 2000;

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -9,13 +9,42 @@ QT       -= core gui
 TARGET = PPTXFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
+
 DEFINES += UNICODE \
     _UNICODE \
     _USE_LIBXML2_READER_ \
-    _LINUX_QT \
-    _LINUX \
-    LINUX \
     _USE_XMLLITE_READER_ \
     USE_LITE_READER \
     PPTX_DEF\
@@ -29,8 +58,25 @@ DEFINES += UNICODE \
     DONT_WRITE_EMBEDDED_FONTS \
     CXIMAGE_DONT_DECLARE_TCHAR
 
-INCLUDEPATH += \
-    /usr/include/libxml2
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
+
+INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 INCLUDEPATH += \
     ../../../../DesktopEditor/freetype-2.5.2/include \
@@ -86,14 +132,11 @@ SOURCES += pptxformatlib.cpp \
     ../../../PPTXFormat/Folder.cpp \
     ../../../Editor/BinaryFileReaderWriter.cpp \
     ../../../Editor/FontPicker.cpp \
-    ../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \
     ../../../../XlsxSerializerCom/Reader/CSVReader.cpp \
     ../../../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \
-    ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
-    ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/FilePosix.cpp \
     ../../../PPTXFormat/Logic/Controls.cpp
 
 HEADERS += pptxformatlib.h \
@@ -510,17 +553,11 @@ HEADERS += pptxformatlib.h \
     ../../../Editor/PPTXWriter.h \
     ../../../Editor/WMFToImageConverter.h \
     ../../../Editor/XmlWriter.h \
-    ../../../../Common/DocxFormat/Source/SystemUtility/File.h \
-    ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/FileSystem.h \
-    ../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h \
     ../../Settings.h \
     ../../../../ASCPresentationEditor/ASCPresentationEditorDef.h \
     ../../../../Common/FileDownloader.h \
-    ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h \
-    ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/File.h \
     ../../../Editor/DefaultNotesMaster.h \
     ../../../Editor/DefaultNotesTheme.h \
-    ../../../../Common/FileDownloader.h \
     ../../../PPTXFormat/DocxFormat/Drawing/LegacyDiagramText.h \
     ../../../PPTXFormat/DocxFormat/Drawing/VmlDrawing.h \
     ../../../PPTXFormat/Logic/Controls.h \

ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro

@@ -9,14 +9,60 @@ QT       -= core gui
 TARGET = RtfFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
 
-DEFINES += _LINUX LINUX UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_ USE_LITE_READER
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
 
-LIBS += -lxml2
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
-INCLUDEPATH += \
-    /usr/include/libxml2
+DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER
+
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
+
+INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+INCLUDEPATH += C:/boost_1_58_0
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 SOURCES += \
     ../source/DestinationCommand.cpp \

ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro

@@ -9,12 +9,40 @@ QT       -= core gui
 TARGET = TxtXmlFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
 DEFINES += UNICODE \
            _UNICODE \
-            LINUX \
-           _LINUX_QT \
            _USE_LIBXML2_READER_ \
            _USE_XMLLITE_READER_ \
             USE_LITE_READER \
@@ -22,9 +50,27 @@ DEFINES += UNICODE \
             DONT_WRITE_EMBEDDED_FONTS
 
 INCLUDEPATH += \
-    ../../../../DesktopEditor/freetype-2.5.2/include
+    ../../../DesktopEditor/freetype-2.5.2/include
+
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
+
+INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
 
 INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 
 HEADERS += \

ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro

@@ -9,12 +9,56 @@ QT       -= core gui
 TARGET = ASCOfficeUtilsLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
 
 DEFINES += UNICODE \
-           _UNICODE \
-            LINUX \
-           _LINUX_QT
+           _UNICODE
+
+#################### WINDOWS #####################
+win32 {
+INCLUDEPATH += \
+    ../../ZLIB/zlib-1.2.3
+}
+#################### WINDOWS #####################
+
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+}
+#################### LINUX ########################
 
 #INCLUDEPATH += \
 #    ../../ZLIB/zlib-1.2.3/contrib/minizip \

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/GraphicsPath.h

@@ -3,7 +3,8 @@
 
 #include "../../Metric.h"
 #include "../../Attributes.h"
-
+#define _USE_MATH_DEFINES
+#include <math.h>//M_PI
 #include <vector>
 
 namespace NSPresentationEditor

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -9,13 +9,60 @@ QT       -= core gui
 TARGET = DocxFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+win32 {
+    QMAKE_CXXFLAGS += -std=c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+}
+
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+############### destination path ###############
+
+DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER
+
+#################### WINDOWS #####################
+win32 {
+    DEFINES += \
+        LIBXML_READER_ENABLED
 
-DEFINES += _LINUX LINUX UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_ USE_LITE_READER
+INCLUDEPATH += ../Source/XML/libxml2/XML/include
+}
+#################### WINDOWS #####################
 
-LIBS += -lxml2
+#################### LINUX ########################
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
 
 INCLUDEPATH += /usr/include/libxml2
+}
+#################### LINUX ########################
 
 SOURCES += docxformatlib.cpp \
     ../Source/Common/Align.cpp \
@@ -50,8 +97,6 @@ SOURCES += docxformatlib.cpp \
     ../Source/DocxFormat/Docx.cpp \
     ../Source/DocxFormat/FileFactory.cpp \
     ../Source/DocxFormat/IFileContainer.cpp \
-    ../Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
-    ../Source/SystemUtility/FileSystem/FilePosix.cpp \
     ../Source/SystemUtility/SystemUtility.cpp \
     ../Source/Utility/codecvt.cpp \
     ../Source/Utility/DateTime.cpp \
@@ -66,6 +111,16 @@ SOURCES += docxformatlib.cpp \
     ../Source/Base/unicode_util.cpp \
     ../../3dParty/pole/pole.cpp
 
+win32 {
+    SOURCES += \
+        ../Source/SystemUtility/FileSystem/Directory.cpp \
+        ../Source/SystemUtility/FileSystem/File.cpp \
+} else {
+    SOURCES += \
+        ../Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
+        ../Source/SystemUtility/FileSystem/FilePosix.cpp \
+}
+
 HEADERS += docxformatlib.h \
     ../Source/Base/Base.h \
     ../Source/Base/Nullable.h \

Common/DocxFormat/Source/Utility/DateTime.cpp

@@ -28,13 +28,13 @@ DateTime::DateTime()
 
 DateTime::DateTime(const CString &sValue, const CString &sPattern)	
 	:
-	m_nYear         ( ParseValue( sValue, sPattern, "%YYYY") ),
-	m_nMonth        ( ParseValue( sValue, sPattern, "%MM"  ) ),
-	m_nDay          ( ParseValue( sValue, sPattern, "%DD"  ) ),
-	m_nHour         ( ParseValue( sValue, sPattern, "%hh"  ) ),
-	m_nMinute       ( ParseValue( sValue, sPattern, "%mm"  ) ),
-	m_nSecond       ( ParseValue( sValue, sPattern, "%ss"  ) ),
-	m_nMillisecond	( ParseValue( sValue, sPattern, "%ms"  ) )
+    m_nYear         ( ParseValue( sValue, sPattern, _T("%YYYY")) ),
+    m_nMonth        ( ParseValue( sValue, sPattern, _T("%MM")  ) ),
+    m_nDay          ( ParseValue( sValue, sPattern, _T("%DD")  ) ),
+    m_nHour         ( ParseValue( sValue, sPattern, _T("%hh")  ) ),
+    m_nMinute       ( ParseValue( sValue, sPattern, _T("%mm")  ) ),
+    m_nSecond       ( ParseValue( sValue, sPattern, _T("%ss")  ) ),
+    m_nMillisecond	( ParseValue( sValue, sPattern, _T("%ms")  ) )
 {
 }
 

Common/DocxFormat/Source/Utility/codecvt.cpp

 #include "codecvt.h"
+#include <algorithm>
 
 using namespace std;
 
@@ -10,7 +11,7 @@ ucs2_conversion::do_in(mbstate_t&,
 {
 	const int max_input = (from_end - from) & ~1;
 	const int max_output = (to_limit - to);
-	int count = min(max_input / 2, max_output); // TODO  ,    
+    int count = std::min(max_input / 2, max_output); // TODO  ,    
 
 	from_next = from;
 	to_next = to;
@@ -35,7 +36,7 @@ ucs2_conversion::do_out(mbstate_t&,
 {
 	const int max_input = (from_end - from);
 	const int max_output = (to_limit - to) & ~1;
-	int count = min(max_input, max_output / 2);	// TODO  ,    
+    int count = std::min(max_input, max_output / 2);	// TODO  ,    
 
 	from_next = from;
 	to_next = to;
@@ -57,7 +58,7 @@ ube_conversion::do_in(mbstate_t&,
 {
 	const int max_input = (from_end - from) & ~1;
 	const int max_output = (to_limit - to);
-	int count = min(max_input / 2, max_output); // TODO  ,    
+    int count = std::min(max_input / 2, max_output); // TODO  ,    
 
 	from_next = from;
 	to_next = to;
@@ -81,7 +82,7 @@ ube_conversion::do_out(mbstate_t&,
 {
 	const int max_input = (from_end - from);
 	const int max_output = (to_limit - to) & ~1;
-	int count = min(max_input, max_output / 2);	// TODO  ,    
+    int count = std::min(max_input, max_output / 2);	// TODO  ,    
 
 	from_next = from;
 	to_next = to;