x2t linux build (wmf/emf)

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

ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro

@@ -10,7 +10,12 @@ TARGET = ASCHTMLRendererLib
 TEMPLATE = lib
 CONFIG += staticlib
 QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
-DEFINES += UNICODE _UNICODE _LINUX_QT NODOCX DESKTOP_EDITOR_GRAPHICS
+
+DEFINES +=  UNICODE \
+            _UNICODE \
+            _LINUX_QT \
+            NODOCX \
+            DESKTOP_EDITOR_GRAPHICS
 
 INCLUDEPATH += \
     ../../DesktopEditor/freetype-2.5.2/include \
@@ -24,7 +29,8 @@ SOURCES += ../ASCSVGWriter.cpp \
     ../../DesktopEditor/raster/Metafile/MetaFile.cpp \
     ../../DesktopEditor/raster/Metafile/Emf/EmfObjects.cpp \
     ../../DesktopEditor/raster/Metafile/Emf/EmfPath.cpp \
-    ../../DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp
+    ../../DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp \
+    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.cpp
 
 HEADERS += ../ASCSVGWriter.h \
     ../CASCImage.h \
@@ -38,7 +44,6 @@ HEADERS += ../ASCSVGWriter.h \
     ../Writer/SVGWriter.h \
     ../Writer/VectorGraphicsWriter2.h \
     ../Writer/VMLWriter.h \
-unix { \
     ../../DesktopEditor/raster/Metafile/Common.h \
     ../../DesktopEditor/raster/Metafile/MetaFile.h \
     ../../DesktopEditor/raster/Metafile/Emf/EmfFile.h \
@@ -61,7 +66,11 @@ unix { \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfOutputDevice.h \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfRegion.h \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfTypes.h \
-    ../../DesktopEditor/raster/Metafile/Wmf/WmfUtils.h
+    ../../DesktopEditor/raster/Metafile/Wmf/WmfUtils.h \
+    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.h
+
+unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -90,7 +90,6 @@ SOURCES += pptxformatlib.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \
     ../../../../XlsxSerializerCom/Reader/CSVReader.cpp \
-    #../../../../DesktopEditor/raster/BgraFrame.cpp \
     ../../../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \
     ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
@@ -518,7 +517,6 @@ HEADERS += pptxformatlib.h \
     ../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h \
     ../../Settings.h \
     ../../../../ASCPresentationEditor/ASCPresentationEditorDef.h \
-    ../../../../DesktopEditor/raster/BgraFrame.h \
     ../../../../Common/FileDownloader.h \
     ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h \
     ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/File.h \

DesktopEditor/Qt_build/graphics/project/graphics.pro

@@ -432,11 +432,9 @@ SOURCES += \
     ../../../cximage/CxImage/ximawmf.cpp \
     ../../../cximage/CxImage/ximawnd.cpp \
     ../../../cximage/CxImage/xmemfile.cpp \
-    \
     ../../../raster/BgraFrame.cpp \
     ../../../raster/ImageFileFormatChecker.cpp
 
-
 HEADERS += \
     ../../../graphics/AggPlusEnums.h \
     ../../../graphics/aggplustypes.h \
@@ -626,11 +624,9 @@ HEADERS += \
     ../../../cximage/CxImage/ximawbmp.h \
     ../../../cximage/CxImage/xiofile.h \
     ../../../cximage/CxImage/xmemfile.h \
-    \
-    ../../../raster/bgraframe.h \
+    ../../../raster/BgraFrame.h \
     ../../../raster/ImageFileFormatChecker.h
 
-
 unix {
     target.path = /usr/lib
     INSTALLS += target