уход от экспорта под линуксом OfficeUtils

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

DesktopEditor/Qt_build/graphics/project/graphics.pri

@@ -226,6 +226,20 @@ SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri.c
 SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri2.c
 SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri3.c
 
+!build_cximage_zlib_disable {
+SOURCES += \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/crc32.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/adler32.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/deflate.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inffast.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inflate.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inftrees.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/trees.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/zutil.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/uncompr.c \
+    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/compress.c \
+}
+
 SOURCES += \
     $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_callback_xs.c \
     $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_descr.c \
@@ -304,17 +318,6 @@ SOURCES += \
     $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_write.c \
     $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_zip.c \
     \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/crc32.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/adler32.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/deflate.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inffast.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inflate.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/inftrees.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/trees.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/zutil.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/uncompr.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/zlib/compress.c \
-    \
     $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/tif_xfile.cpp \
     $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximabmp.cpp \
     $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximadsp.cpp \

DjVuFile/DjVuFile.pro

@@ -45,10 +45,12 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 shared {
     DEFINES += DJVU_USE_DYNAMIC_LIBRARY
 
-    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
     LIBS += -L$$DESTDIR -lPdfWriter
 
-    #LIBS += -L$$DESTDIR -lgraphics
+    CONFIG += build_all_zlib build_zlib_as_sources
+    include(../OfficeUtils/OfficeUtils.pri)
+
+    CONFIG += build_cximage_zlib_disable
     LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
     include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
 

HtmlRenderer/htmlrenderer.pro

@@ -13,6 +13,8 @@ TEMPLATE = lib
 
 QMAKE_CXXFLAGS += -std=c++11
 
+CONFIG -= debug_and_release debug_and_release_target
+
 #CONFIG += staticlib
 CONFIG += shared
 
@@ -48,9 +50,10 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 shared {
     DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
 
-    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
+    CONFIG += build_all_zlib build_zlib_as_sources
+    include(../OfficeUtils/OfficeUtils.pri)
 
-    #LIBS += -L$$DESTDIR -lgraphics
+    CONFIG += build_cximage_zlib_disable
     LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
     include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
 

PdfReader/PdfReader.pro

@@ -48,9 +48,10 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 shared {
     DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
 
-    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
+    CONFIG += build_all_zlib build_zlib_as_sources
+    include(../OfficeUtils/OfficeUtils.pri)
 
-    #LIBS += -L$$DESTDIR -lgraphics
+    CONFIG += build_cximage_zlib_disable
     LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
     include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
 

PdfWriter/PdfWriter.pro

@@ -45,9 +45,10 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 shared {
     DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY
 
-    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
+    CONFIG += build_all_zlib build_zlib_as_sources
+    include(../OfficeUtils/OfficeUtils.pri)
 
-    #LIBS += -L$$DESTDIR -lgraphics
+    CONFIG += build_cximage_zlib_disable
     LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
     include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
 

XpsFile/XpsFile.pro

@@ -45,10 +45,12 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 shared {
     DEFINES += XPS_USE_DYNAMIC_LIBRARY
 
-    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
     LIBS += -L$$DESTDIR -lPdfWriter
 
-    #LIBS += -L$$DESTDIR -lgraphics
+    CONFIG += build_all_zlib build_zlib_as_sources
+    include(../OfficeUtils/OfficeUtils.pri)
+
+    CONFIG += build_cximage_zlib_disable
     LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
     include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)