From 93d1688e137069eb90e252287cce1bcd787c7264 Mon Sep 17 00:00:00 2001 From: "Elena.Subbotina" Date: Wed, 18 May 2022 10:58:21 +0300 Subject: [PATCH] . --- .../source/linux/VbaFormatLib.pro | 18 ++++-------------- X2tConverter/build/Qt/X2tSLN.pri | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro b/ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro index 007244c6ff..b65010beb8 100644 --- a/ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro +++ b/ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro @@ -16,23 +16,13 @@ PWD_ROOT_DIR = $$PWD CONFIG += core_x2t include(../../../Common/base.pri) +DEFINES += UNICODE \ + _UNICODE \ + DONT_WRITE_EMBEDDED_FONTS + #BOOST include($$PWD/../../../Common/3dParty/boost/boost.pri) -DEFINES += UNICODE \ - _UNICODE \ - DONT_WRITE_EMBEDDED_FONTS - -CONFIG(debug, debug|release){ - -message(Debug) -DEFINES += _DEBUG -} - -core_mac { -LIBS += $$DESTDIR -lUnicodeConverter -} - SOURCES += \ ../VbaFormat/Records.cpp \ ../VbaFormat/StreamObjects.cpp \ diff --git a/X2tConverter/build/Qt/X2tSLN.pri b/X2tConverter/build/Qt/X2tSLN.pri index fe27d481d8..5e4b558cc0 100644 --- a/X2tConverter/build/Qt/X2tSLN.pri +++ b/X2tConverter/build/Qt/X2tSLN.pri @@ -44,7 +44,6 @@ kernel.file = ../../../Common/kernel.pro doctrenderer.file = ../../../DesktopEditor/doctrenderer/doctrenderer.pro X2tConverter.depends = \ - VbaFormatLib \ XlsbFormatLib \ DocxFormatLib \ PPTXFormatLib \ @@ -55,6 +54,7 @@ X2tConverter.depends = \ DocFormatLib \ OdfFileReaderLib \ OdfFileWriterLib \ + VbaFormatLib \ XlsFormatLib \ kernel.pro \ HtmlFile2 \