Commit f06d166a authored by Oleg Korshul's avatar Oleg Korshul

use base.pri

parent 4d528b2f
...@@ -10,44 +10,14 @@ TARGET = DocFormatLib ...@@ -10,44 +10,14 @@ TARGET = DocFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../../Common/base.pri)
QMAKE_CXXFLAGS += /bigobj
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ #BOOST
DESTDIR = $$DESTINATION_SDK_PATH/linux_64 include($$PWD/../../../Common/3dParty/boost/boost.pri)
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
...@@ -57,38 +27,11 @@ DEFINES += UNICODE \ ...@@ -57,38 +27,11 @@ DEFINES += UNICODE \
_USE_LIBXML2_READER_ \ _USE_LIBXML2_READER_ \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
#################### 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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC
INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
QMAKE_MAC_SDK = macosx10.11
core_mac {
QMAKE_MAC_SDK = macosx10.11
} }
#################### LINUX ########################
SOURCES += \ SOURCES += \
../DocFormatLib.cpp \ ../DocFormatLib.cpp \
...@@ -333,10 +276,3 @@ HEADERS += \ ...@@ -333,10 +276,3 @@ HEADERS += \
../../../Common/3dParty/pole/pole.h \ ../../../Common/3dParty/pole/pole.h \
../../DocDocxConverter/EncryptionHeader.h \ ../../DocDocxConverter/EncryptionHeader.h \
../../DocDocxConverter/DrawingPrimitives.h ../../DocDocxConverter/DrawingPrimitives.h
unix {
target.path = /usr/lib
INSTALLS += target
}
#-------------------------------------------------
#
# Project created by QtCreator 2014-10-10T14:24:04
#
#-------------------------------------------------
QT -= core gui QT -= core gui
TARGET = ASCOfficeDocxFile2Lib TARGET = ASCOfficeDocxFile2Lib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../..
PWD_ROOT_DIR = $$PWD
win32 {
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../build/lib
# WINDOWS CONFIG += core_x2t
win32:contains(QMAKE_TARGET.arch, x86_64):{ include(../../Common/base.pri)
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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
...@@ -65,35 +23,9 @@ DEFINES += UNICODE \ ...@@ -65,35 +23,9 @@ DEFINES += UNICODE \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += \ INCLUDEPATH += \
../../DesktopEditor/freetype-2.5.2/include ../../DesktopEditor/freetype-2.5.2/include \
../../DesktopEditor/xml/libxml2/include \
#################### 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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC
INCLUDEPATH += ../../DesktopEditor/xml/libxml2/include
}
#################### LINUX ########################
SOURCES += ../DocWrapper/DocxSerializer.cpp \ SOURCES += ../DocWrapper/DocxSerializer.cpp \
../DocWrapper/FontProcessor.cpp \ ../DocWrapper/FontProcessor.cpp \
...@@ -142,9 +74,3 @@ HEADERS += ../DocWrapper/DocxSerializer.h \ ...@@ -142,9 +74,3 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
../DocWrapper/ChartWriter.h \ ../DocWrapper/ChartWriter.h \
../../OfficeCryptReader/source/ECMACryptReader.h \ ../../OfficeCryptReader/source/ECMACryptReader.h \
../../OfficeCryptReader/source/CryptTransform.h ../../OfficeCryptReader/source/CryptTransform.h
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -10,90 +10,29 @@ TARGET = OdfFileReaderLib ...@@ -10,90 +10,29 @@ TARGET = OdfFileReaderLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../Common/base.pri)
QMAKE_CXXFLAGS += /bigobj
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../build/lib
# WINDOWS #BOOST
win32:contains(QMAKE_TARGET.arch, x86_64):{ include($$PWD/../../Common/3dParty/boost/boost.pri)
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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
_USE_LIBXML2_READER_ \ _USE_LIBXML2_READER_ \
_USE_XMLLITE_READER_ \ _USE_XMLLITE_READER_ \
USE_LITE_READER USE_LITE_READER \
LIBXML_READER_ENABLED
INCLUDEPATH += ../include INCLUDEPATH += ../include
INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
INCLUDEPATH += ../../DesktopEditor/xml/libxml2/include
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
DEFINES += _DEBUG 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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../Common/DocxFormat/Source/XML/libxml2/XML/include
INCLUDEPATH += ../../Common/boost_1_58_0
}
#################### LINUX ########################
build_fast { build_fast {
SOURCES += \ SOURCES += \
...@@ -627,7 +566,3 @@ HEADERS += \ ...@@ -627,7 +566,3 @@ HEADERS += \
../src/odf/table_database_ranges.h \ ../src/odf/table_database_ranges.h \
../src/docx/xlsx_conditionalFormatting.h \ ../src/docx/xlsx_conditionalFormatting.h \
../src/docx/xlsx_dxfs.h ../src/docx/xlsx_dxfs.h
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -10,88 +10,26 @@ TARGET = OdfFileWriterLib ...@@ -10,88 +10,26 @@ TARGET = OdfFileWriterLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../Common/base.pri)
QMAKE_CXXFLAGS += /bigobj
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../build/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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ #BOOST
DESTDIR = $$DESTINATION_SDK_PATH/linux_64 include($$PWD/../../Common/3dParty/boost/boost.pri)
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
_USE_LIBXML2_READER_ \ _USE_LIBXML2_READER_ \
_USE_XMLLITE_READER_ \ _USE_XMLLITE_READER_ \
USE_LITE_READER USE_LITE_READER \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
INCLUDEPATH += ../../ASCOfficeOdfFile/include INCLUDEPATH += ../../ASCOfficeOdfFile/include
INCLUDEPATH += ../../ASCOfficeOdfFile/src/odf/datatypes INCLUDEPATH += ../../ASCOfficeOdfFile/src/odf/datatypes
INCLUDEPATH += ../../DesktopEditor/xml/libxml2/include
#################### 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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../Common/DocxFormat/Source/XML/libxml2/XML/include
INCLUDEPATH += ../../Common/boost_1_58_0
}
#################### LINUX ########################
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
DEFINES += _DEBUG DEFINES += _DEBUG
...@@ -246,11 +184,6 @@ HEADERS += \ ...@@ -246,11 +184,6 @@ HEADERS += \
../source/OdfFormat/odf_settings_context.h \ ../source/OdfFormat/odf_settings_context.h \
../source/OdfFormat/office_settings.h ../source/OdfFormat/office_settings.h
unix {
target.path = /usr/lib
INSTALLS += target
}
SOURCES += \ SOURCES += \
../source/OdfFormat/odf_settings_context.cpp \ ../source/OdfFormat/odf_settings_context.cpp \
../source/OdfFormat/office_settings.cpp ../source/OdfFormat/office_settings.cpp
...@@ -10,46 +10,15 @@ TARGET = PptFormatLib ...@@ -10,46 +10,15 @@ TARGET = PptFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../../Common/base.pri)
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS #BOOST
win32:contains(QMAKE_TARGET.arch, x86_64):{ include($$PWD/../../../Common/3dParty/boost/boost.pri)
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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
USE_ATL_CSTRING \ USE_ATL_CSTRING \
...@@ -68,43 +37,11 @@ DEFINES += UNICODE \ ...@@ -68,43 +37,11 @@ DEFINES += UNICODE \
INCLUDEPATH += \ INCLUDEPATH += \
../../../DesktopEditor/freetype-2.5.2/include ../../../DesktopEditor/freetype-2.5.2/include \
../../../DesktopEditor/xml/libxml2/include
#################### WINDOWS #####################
win32 {
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC
INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
}
#################### LINUX ########################
unix { core_windows {
target.path = /usr/lib INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
INSTALLS += target
} }
HEADERS += \ HEADERS += \
...@@ -255,15 +192,15 @@ SOURCES += \ ...@@ -255,15 +192,15 @@ SOURCES += \
SOURCES += \ SOURCES += \
../../../Common/3dParty/pole/pole.cpp ../../../Common/3dParty/pole/pole.cpp
win32 { core_windows {
SOURCES += \ SOURCES += \
../../../Common/FileDownloader/FileDownloader_win.cpp ../../../Common/FileDownloader/FileDownloader_win.cpp
} }
linux-g++ | linux-g++-64 | linux-g++-32 { core_linux {
SOURCES += \ SOURCES += \
../../../Common/FileDownloader/FileDownloader_curl.cpp ../../../Common/FileDownloader/FileDownloader_curl.cpp
} }
mac { core_mac {
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
../../../Common/FileDownloader/FileDownloader_mac.mm ../../../Common/FileDownloader/FileDownloader_mac.mm
} }
......
...@@ -10,48 +10,18 @@ TARGET = PPTXFormatLib ...@@ -10,48 +10,18 @@ TARGET = PPTXFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../../..
win32 { PWD_ROOT_DIR = $$PWD
#todo accentbordercallout90type, вернуть inline оптимизацию Ob2
QMAKE_CXXFLAGS_RELEASE += -Ob0
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ############### CONFIG += core_x2t
DESTINATION_SDK_PATH = $$PWD/../../../../build/lib include(../../../../Common/base.pri)
# WINDOWS core_windows {
win32:contains(QMAKE_TARGET.arch, x86_64):{ QMAKE_CXXFLAGS_RELEASE += -Ob0
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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ #BOOST
DESTDIR = $$DESTINATION_SDK_PATH/linux_64 include($$PWD/../../../../Common/3dParty/boost/boost.pri)
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
...@@ -67,46 +37,19 @@ DEFINES += UNICODE \ ...@@ -67,46 +37,19 @@ DEFINES += UNICODE \
CXIMAGE_DONT_DECLARE_TCHAR \ CXIMAGE_DONT_DECLARE_TCHAR \
BUILD_CONFIG_FULL_VERSION \ BUILD_CONFIG_FULL_VERSION \
DONT_WRITE_EMBEDDED_FONTS \ DONT_WRITE_EMBEDDED_FONTS \
CXIMAGE_DONT_DECLARE_TCHAR CXIMAGE_DONT_DECLARE_TCHAR \
#################### WINDOWS #####################
win32 {
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../../OfficeUtils/src/zlib-1.2.3
INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += /usr/include/libxml2/libxml core_windows {
} INCLUDEPATH += ../../../../OfficeUtils/src/zlib-1.2.3
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED \
_MAC \
MAC
} }
#################### LINUX ########################
INCLUDEPATH += \ INCLUDEPATH += \
../../../../DesktopEditor/freetype-2.5.2/include \ ../../../../DesktopEditor/freetype-2.5.2/include \
../../../../Common/ASCDocxFormat/Source/Utility \ ../../../../Common/ASCDocxFormat/Source/Utility \
../../../../Common/ASCDocxFormat/Source/XML \ ../../../../Common/ASCDocxFormat/Source/XML \
../../../../Common/ASCDocxFormat/Source \ ../../../../Common/ASCDocxFormat/Source \
../../../../Common/DocxFormat/Source/XML/libxml2/XML/include ../../../../DesktopEditor/xml/libxml2/include
SOURCES += pptxformatlib.cpp SOURCES += pptxformatlib.cpp
...@@ -597,20 +540,15 @@ HEADERS += pptxformatlib.h \ ...@@ -597,20 +540,15 @@ HEADERS += pptxformatlib.h \
../../../PPTXFormat/ShowPr/SldAll.h \ ../../../PPTXFormat/ShowPr/SldAll.h \
../../../PPTXFormat/ShowPr/SldRg.h ../../../PPTXFormat/ShowPr/SldRg.h
win32 { core_windows {
SOURCES += \ SOURCES += \
../../../../Common/FileDownloader/FileDownloader_win.cpp ../../../../Common/FileDownloader/FileDownloader_win.cpp
} }
linux-g++ | linux-g++-64 | linux-g++-32 { core_linux {
SOURCES += \ SOURCES += \
../../../../Common/FileDownloader/FileDownloader_curl.cpp ../../../../Common/FileDownloader/FileDownloader_curl.cpp
} }
mac { core_mac {
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
../../../../Common/FileDownloader/FileDownloader_mac.mm ../../../../Common/FileDownloader/FileDownloader_mac.mm
} }
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -10,85 +10,25 @@ TARGET = RtfFormatLib ...@@ -10,85 +10,25 @@ TARGET = RtfFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../../Common/base.pri)
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac { #BOOST
DESTDIR = $$DESTINATION_SDK_PATH/mac_64 include($$PWD/../../../Common/3dParty/boost/boost.pri)
}
############### destination path ###############
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 ######################## DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED
linux-g++ | linux-g++-64 | linux-g++-32 { INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT
INCLUDEPATH += /usr/include/libxml2
}
mac { core_mac {
DEFINES += \ DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
LIBXML_READER_ENABLED \
_ASC_USE_UNICODE_CONVERTER_ \ _ASC_USE_UNICODE_CONVERTER_ \
UNICODECONVERTER_USE_DYNAMIC_LIBRARY UNICODECONVERTER_USE_DYNAMIC_LIBRARY
INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
INCLUDEPATH += ../../../Common/boost_1_58_0
LIBS += $$DESTDIR -lUnicodeConverter LIBS += $$DESTDIR -lUnicodeConverter
} }
#################### LINUX ########################
build_fast { build_fast {
SOURCES += \ SOURCES += \
...@@ -209,10 +149,6 @@ HEADERS += \ ...@@ -209,10 +149,6 @@ HEADERS += \
../source/Writer/OOXThemeWriter.h \ ../source/Writer/OOXThemeWriter.h \
../source/Writer/OOXWriter.h \ ../source/Writer/OOXWriter.h \
../source/Ole1FormatReader.h ../source/Ole1FormatReader.h
unix {
target.path = /usr/lib
INSTALLS += target
}
SOURCES += \ SOURCES += \
../source/RtfMath.cpp \ ../source/RtfMath.cpp \
......
...@@ -10,45 +10,11 @@ TARGET = TxtXmlFormatLib ...@@ -10,45 +10,11 @@ TARGET = TxtXmlFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
win32 { PWD_ROOT_DIR = $$PWD
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ CONFIG += core_x2t
DESTDIR = $$DESTINATION_SDK_PATH/linux_64 include(../../../Common/base.pri)
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE \ _UNICODE \
...@@ -56,43 +22,12 @@ DEFINES += UNICODE \ ...@@ -56,43 +22,12 @@ DEFINES += UNICODE \
_USE_XMLLITE_READER_ \ _USE_XMLLITE_READER_ \
USE_LITE_READER \ USE_LITE_READER \
BUILD_CONFIG_FULL_VERSION \ BUILD_CONFIG_FULL_VERSION \
DONT_WRITE_EMBEDDED_FONTS DONT_WRITE_EMBEDDED_FONTS \
INCLUDEPATH += \
../../../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
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include INCLUDEPATH += \
} ../../../DesktopEditor/freetype-2.5.2/include \
#################### LINUX ######################## ../../../DesktopEditor/xml/libxml2/include
HEADERS += \ HEADERS += \
../Source/TxtXmlEvent.h \ ../Source/TxtXmlEvent.h \
...@@ -123,8 +58,3 @@ SOURCES += \ ...@@ -123,8 +58,3 @@ SOURCES += \
../Source/ConvertDocx2Txt.cpp \ ../Source/ConvertDocx2Txt.cpp \
../Source/ConvertTxt2Docx.cpp ../Source/ConvertTxt2Docx.cpp
} }
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -10,44 +10,14 @@ TARGET = XlsFormatLib ...@@ -10,44 +10,14 @@ TARGET = XlsFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../../Common/base.pri)
QMAKE_CXXFLAGS += /bigobj
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS #BOOST
win32:contains(QMAKE_TARGET.arch, x86_64):{ include($$PWD/../../../Common/3dParty/boost/boost.pri)
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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \ DEFINES += UNICODE \
_UNICODE _UNICODE
...@@ -58,38 +28,15 @@ message(Debug) ...@@ -58,38 +28,15 @@ message(Debug)
DEFINES += _DEBUG DEFINES += _DEBUG
} }
#################### WINDOWS ##################### core_mac {
win32 { DEFINES += \
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += C:/boost_1_58_0
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
_ASC_USE_UNICODE_CONVERTER_ \ _ASC_USE_UNICODE_CONVERTER_ \
UNICODECONVERTER_USE_DYNAMIC_LIBRARY UNICODECONVERTER_USE_DYNAMIC_LIBRARY
INCLUDEPATH += ../../../Common/boost_1_58_0
LIBS += $$DESTDIR -lUnicodeConverter LIBS += $$DESTDIR -lUnicodeConverter
} }
#################### LINUX ########################
INCLUDEPATH += ../../../DesktopEditor/freetype-2.5.2/include INCLUDEPATH += ../../../DesktopEditor/freetype-2.5.2/include
INCLUDEPATH += ../XlsFormat INCLUDEPATH += ../XlsFormat
INCLUDEPATH += ../Common INCLUDEPATH += ../Common
...@@ -1777,14 +1724,6 @@ HEADERS += \ ...@@ -1777,14 +1724,6 @@ HEADERS += \
../XlsFormat/Logic/Biff_records/IMDATA.h \ ../XlsFormat/Logic/Biff_records/IMDATA.h \
../XlsFormat/Logic/Biff_structures/CFDatabar.h ../XlsFormat/Logic/Biff_structures/CFDatabar.h
unix {
target.path = /usr/lib
INSTALLS += target
}
SOURCES += \ SOURCES += \
../XlsFormat/Logic/Biff_unions/IMDATAOBJECT.cpp \ ../XlsFormat/Logic/Biff_unions/IMDATAOBJECT.cpp \
../XlsFormat/Logic/Biff_records/IMDATA.cpp \ ../XlsFormat/Logic/Biff_records/IMDATA.cpp \
......
...@@ -23,3 +23,18 @@ core_release { ...@@ -23,3 +23,18 @@ core_release {
} }
} }
core_boost_regex {
core_windows {
core_debug {
LIBS += -L$$CORE_BOOST_LIBS -llibboost_regex-vc120-mt-gd-1_58
}
core_release {
LIBS += -L$$CORE_BOOST_LIBS -llibboost_regex-vc120-mt-1_58
}
} else {
LIBS += -L$$CORE_BOOST_LIBS -lboost_regex
}
}
...@@ -25,15 +25,15 @@ md %folder%\static_fpic ...@@ -25,15 +25,15 @@ md %folder%\static_fpic
md %folder%\shared md %folder%\shared
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=static --with-filesystem --with-system --with-date_time .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex
XCOPY stage\lib\* "%folder%\static\" XCOPY stage\lib\* "%folder%\static\"
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex
XCOPY stage\lib\* "%folder%\static_fpic\" XCOPY stage\lib\* "%folder%\static_fpic\"
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=shared --with-filesystem --with-system --with-date_time .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex
XCOPY stage\lib\* "%folder%\shared\" XCOPY stage\lib\* "%folder%\shared\"
SET folder=build/win_64 SET folder=build/win_64
...@@ -53,13 +53,13 @@ md %folder%\static_fpic ...@@ -53,13 +53,13 @@ md %folder%\static_fpic
md %folder%\shared md %folder%\shared
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=static --with-filesystem --with-system --with-date_time address-model=64 .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex address-model=64
XCOPY stage\lib\* "%folder%\static\" XCOPY stage\lib\* "%folder%\static\"
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time address-model=64 .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex address-model=64
XCOPY stage\lib\* "%folder%\static_fpic\" XCOPY stage\lib\* "%folder%\static_fpic\"
.\b2.exe --clean .\b2.exe --clean
.\bjam.exe link=shared --with-filesystem --with-system --with-date_time address-model=64 .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex address-model=64
XCOPY stage\lib\* "%folder%\shared\" XCOPY stage\lib\* "%folder%\shared\"
\ No newline at end of file
...@@ -24,7 +24,7 @@ outputdir="$SCRIPTPATH/boost_1_58_0/build/$platform$arch" ...@@ -24,7 +24,7 @@ outputdir="$SCRIPTPATH/boost_1_58_0/build/$platform$arch"
echo $outputdir echo $outputdir
cd "$SCRIPTPATH/boost_1_58_0" cd "$SCRIPTPATH/boost_1_58_0"
./bootstrap.sh --with-libraries=filesystem,system,date_time ./bootstrap.sh --with-libraries=filesystem,system,date_time,regex
folder="build/$platform$arch" folder="build/$platform$arch"
if [ -d $folder ]; then if [ -d $folder ]; then
......
#-------------------------------------------------
#
# Project created by QtCreator 2016-07-26T18:24:47
#
#-------------------------------------------------
QT -= core gui QT -= core gui
TARGET = CryptoPPLib TARGET = CryptoPPLib
...@@ -12,37 +6,16 @@ CONFIG += staticlib ...@@ -12,37 +6,16 @@ CONFIG += staticlib
DEFINES += CRYPTOPPLIB_LIBRARY DEFINES += CRYPTOPPLIB_LIBRARY
############### destination path ############### CORE_ROOT_DIR = $$PWD/../../../..
DESTINATION_SDK_PATH = $$PWD/../../../../build/lib PWD_ROOT_DIR = $$PWD
# 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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ include(../../../../Common/base.pri)
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac { core_windows {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64 DEFINES -= UNICODE
} }
############### destination path ###############
DEFINES += CRYPTOPP_DISABLE_ASM
HEADERS += \ HEADERS += \
../3way.h \ ../3way.h \
...@@ -320,8 +293,3 @@ SOURCES += \ ...@@ -320,8 +293,3 @@ SOURCES += \
../zlib.cpp \ ../zlib.cpp \
../cpu.cpp ../cpu.cpp
unix {
target.path = /usr/lib
INSTALLS += target
}
CORE_V8_PATH_INCLUDE = $$CORE_ROOT_DIR/Common/3dParty/v8/v8
CORE_V8_PATH_LIBS = $$CORE_ROOT_DIR/Common/3dParty/v8/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX
INCLUDEPATH += \
$$CORE_V8_PATH_INCLUDE \
$$CORE_V8_PATH_INCLUDE/include
core_windows { core_windows {
INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/include INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/include
} }
......
...@@ -10,82 +10,16 @@ TARGET = DocxFormatLib ...@@ -10,82 +10,16 @@ TARGET = DocxFormatLib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11 CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
win32 { CONFIG += core_x2t
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings include(../../../Common/base.pri)
QMAKE_CXXFLAGS += /bigobj
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../build/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++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac { DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER
#################### WINDOWS #####################
win32 {
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../Source/XML/libxml2/XML/include
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT
INCLUDEPATH += /usr/include/libxml2
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC
INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
DEFINES += \
LIBXML_READER_ENABLED
}
#################### LINUX ########################
build_fast { build_fast {
SOURCES += \ SOURCES += \
docxformatlib_logic.cpp \ docxformatlib_logic.cpp \
...@@ -125,7 +59,7 @@ SOURCES += \ ...@@ -125,7 +59,7 @@ SOURCES += \
../Source/XlsxFormat/FileFactory_Spreadsheet.cpp \ ../Source/XlsxFormat/FileFactory_Spreadsheet.cpp \
../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp \ ../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp \
win32 { core_windows {
SOURCES += \ SOURCES += \
../Source/SystemUtility/FileSystem/Directory.cpp \ ../Source/SystemUtility/FileSystem/Directory.cpp \
../Source/SystemUtility/FileSystem/File.cpp \ ../Source/SystemUtility/FileSystem/File.cpp \
...@@ -351,8 +285,3 @@ HEADERS += docxformatlib.h \ ...@@ -351,8 +285,3 @@ HEADERS += docxformatlib.h \
../Source/XlsxFormat/ExternalLinks/ExternalLinks.h \ ../Source/XlsxFormat/ExternalLinks/ExternalLinks.h \
../Source/XlsxFormat/Worksheets/Sparkline.h \ ../Source/XlsxFormat/Worksheets/Sparkline.h \
../Source/XlsxFormat/Ole/OleObjects.h ../Source/XlsxFormat/Ole/OleObjects.h
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -130,3 +130,15 @@ plugin { ...@@ -130,3 +130,15 @@ plugin {
staticlib { staticlib {
DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
} }
core_x2t {
core_windows {
CONFIG(debug, debug|release) {
QMAKE_CXXFLAGS += /bigobj
}
} else {
QMAKE_CXXFLAGS += -Wall -Wno-ignored-qualifiers
}
DEFINES += CRYPTOPP_DISABLE_ASM
}
...@@ -10,28 +10,31 @@ QT -= gui ...@@ -10,28 +10,31 @@ QT -= gui
VERSION = 2.0.2.382 VERSION = 2.0.2.382
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
mac { TEMPLATE = app
message(64 bit) CONFIG += console
TARGET = x2t CONFIG -= app_bundle
} else {
contains(QMAKE_HOST.arch, x86_64):{ TARGET = x2t
#64bit
message(64 bit) CORE_ROOT_DIR = $$PWD/../../..
TARGET = x2t PWD_ROOT_DIR = $$PWD
}
!contains(QMAKE_HOST.arch, x86_64):{ CONFIG += core_static_link_libstd
#32bit CONFIG += core_x2t
message(32 bit) include(../../../Common/base.pri)
core_win_32 {
TARGET = x2t32 TARGET = x2t32
} }
core_linux_32 {
TARGET = x2t32
} }
TEMPLATE = app #BOOST
CONFIG += console CONFIG += core_boost_regex
CONFIG -= app_bundle include($$PWD/../../../Common/3dParty/boost/boost.pri)
win32 { core_windows {
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
QMAKE_LFLAGS += /INCREMENTAL:NO QMAKE_LFLAGS += /INCREMENTAL:NO
contains(QMAKE_TARGET.arch, x86_64):{ contains(QMAKE_TARGET.arch, x86_64):{
...@@ -41,18 +44,7 @@ win32 { ...@@ -41,18 +44,7 @@ win32 {
} }
} else { } else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -Wall -Wno-ignored-qualifiers
}
CONFIG += c++11
# теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
message(static_link_libstd)
} }
#CONFIG += build_for_centos6 #CONFIG += build_for_centos6
...@@ -74,7 +66,8 @@ DEFINES += UNICODE \ ...@@ -74,7 +66,8 @@ DEFINES += UNICODE \
CXIMAGE_DONT_DECLARE_TCHAR \ CXIMAGE_DONT_DECLARE_TCHAR \
BUILD_CONFIG_FULL_VERSION \ BUILD_CONFIG_FULL_VERSION \
DONT_WRITE_EMBEDDED_FONTS \ DONT_WRITE_EMBEDDED_FONTS \
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
LIBXML_READER_ENABLED
DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY
...@@ -84,42 +77,15 @@ DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY ...@@ -84,42 +77,15 @@ DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY
DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
#################### WINDOWS ##################### core_windows {
win32 { INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\
INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT
INCLUDEPATH += /usr/include/libxml2
} }
core_mac {
mac { INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
MAC \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\
INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
} }
#################### LINUX ########################
INCLUDEPATH += \ INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
../../../DesktopEditor/freetype-2.5.2/include INCLUDEPATH += ../../../DesktopEditor/freetype-2.5.2/include
INCLUDEPATH += $$PWD/../../../Common/DocxFormat INCLUDEPATH += $$PWD/../../../Common/DocxFormat
DEPENDPATH += $$PWD/../../../Common/DocxFormat DEPENDPATH += $$PWD/../../../Common/DocxFormat
...@@ -148,118 +114,72 @@ HEADERS += ../../src/cextracttools.h \ ...@@ -148,118 +114,72 @@ HEADERS += ../../src/cextracttools.h \
############################################################################################################### ###############################################################################################################
############### destination path ############### DESTDIR = $$PWD/../../../build/bin
DESTINATION_SDK_PATH = $$PWD/../../../build/lib core_windows {
DESTINATION_BIN_PATH = $$PWD/../../../build/bin DESTDIR = $$DESTDIR/windows
win32:contains(QMAKE_TARGET.arch, x86_64):{
message(win64)
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/windows
CONFIG(debug, debug|release) {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64/DEBUG
} else {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64
}
} }
win32:!contains(QMAKE_TARGET.arch, x86_64):{ core_linux {
message(win32) DESTDIR = $$DESTDIR/linux
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/windows
CONFIG(debug, debug|release) {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32/DEBUG
} else {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32
} }
core_mac {
DESTDIR = $$DESTDIR/mac
} }
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
message(linuX)
LIBS += $$PWD/../../../Common/3dParty/icu/linux_64/build/libicuuc.so.55
LIBS += $$PWD/../../../Common/3dParty/icu/linux_64/build/libicudata.so.55
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/linux
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/linux
}
mac {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/mac_64
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/mac
}
DESTDIR = $$DESTINATION_BIN_PATH
############### destination path ###############
message(destination sdk path = $$DESTINATION_SDK_PATH)
CONFIG(debug, debug|release) {
message(Debug)
BOOST_LIBNAME_POSTFIX = -gd
} else {
message(Release)
}
#Xls file #Xls file
LIBS += -L$$DESTINATION_SDK_PATH -lXlsFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXlsFormatLib
# odf format writer # odf format writer
LIBS += -L$$DESTINATION_SDK_PATH -lOdfFileWriterLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lOdfFileWriterLib
# odf format reader # odf format reader
LIBS += -L$$DESTINATION_SDK_PATH -lOdfFileReaderLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lOdfFileReaderLib
#doc file #doc file
LIBS += -L$$DESTINATION_SDK_PATH -lDocFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDocFormatLib
# ppt file # ppt file
LIBS += -L$$DESTINATION_SDK_PATH -lPptFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPptFormatLib
#rtf file #rtf file
LIBS += -L$$DESTINATION_SDK_PATH -lRtfFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lRtfFormatLib
#txt(xml) file #txt(xml) file
LIBS += -L$$DESTINATION_SDK_PATH -lTxtXmlFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lTxtXmlFormatLib
# pdf writer # pdf writer
LIBS += -L$$DESTINATION_SDK_PATH -lPdfWriter LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
#docxfile2 #docxfile2
LIBS += -L$$DESTINATION_SDK_PATH -lASCOfficeDocxFile2Lib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lASCOfficeDocxFile2Lib
#pptxformat #pptxformat
LIBS += -L$$DESTINATION_SDK_PATH -lPPTXFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPPTXFormatLib
#docxformat #docxformat
LIBS += -L$$DESTINATION_SDK_PATH -lDocxFormatLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDocxFormatLib
#office utils #office utils
LIBS += -L$$DESTINATION_SDK_PATH -lOfficeUtils LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lOfficeUtils
#graphics #graphics
LIBS += -L$$DESTINATION_SDK_PATH -lgraphics LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics
#doctrenderer #doctrenderer
LIBS += -L$$DESTINATION_SDK_PATH -ldoctrenderer LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
#HtmlRenderer #HtmlRenderer
LIBS += -L$$DESTINATION_SDK_PATH -lHtmlRenderer LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
LIBS += -L$$DESTINATION_SDK_PATH -lPdfReader LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
LIBS += -L$$DESTINATION_SDK_PATH -lDjVuFile LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDjVuFile
LIBS += -L$$DESTINATION_SDK_PATH -lXpsFile LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXpsFile
#HtmlFile #HtmlFile
LIBS += -L$$DESTINATION_SDK_PATH -lHtmlFile LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlFile
#UnicodeConverter #UnicodeConverter
LIBS += -L$$DESTINATION_SDK_PATH -lUnicodeConverter LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter
#Crypto++ #Crypto++
LIBS += -L$$DESTINATION_SDK_PATH -lCryptoPPLib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib
##################################################### #####################################################
# внешнее подключение сторонних библиотек # внешнее подключение сторонних библиотек
win32 { core_windows {
LIBS += -lurlmon LIBS += -lurlmon
LIBS += -LC:\boost_1_58_0\stage\lib -llibboost_regex-vc120-mt$$BOOST_LIBNAME_POSTFIX-1_58 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -llibxml
} }
linux-g++ | linux-g++-64 | linux-g++-32 { core_linux {
LIBS += -lboost_regex
LIBS += -lz LIBS += -lz
LIBS += -lxml2 LIBS += -lxml2
LIBS += -lcurl LIBS += -lcurl
} }
mac { mac {
LIBS += -L$$PWD/../../../Common/boost_1_58_0/stage/lib -lboost_regex LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -llibxml
LIBS += -L$$DESTINATION_SDK_PATH -llibxml
LIBS += -framework AppKit LIBS += -framework AppKit
} }
######################################################## ########################################################
......
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG -= debug_and_release debug_and_release_target CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
# важно!!! build directory должна быть на уровне выше, чтобы Makefile и $$PWD были на одном уровне к ServerComponents include(../../../Common/base.pri)
SUBDIRS = \ SUBDIRS = \
OfficeUtils \ OfficeUtils \
graphics \ graphics \
cryptopp \
DocxFormatLib \ DocxFormatLib \
PPTXFormatLib \ PPTXFormatLib \
ASCOfficeDocxFile2Lib \ ASCOfficeDocxFile2Lib \
...@@ -21,6 +23,7 @@ SUBDIRS = \ ...@@ -21,6 +23,7 @@ SUBDIRS = \
OfficeUtils.file = ../../../OfficeUtils/OfficeUtils.pro OfficeUtils.file = ../../../OfficeUtils/OfficeUtils.pro
graphics.file = ../../../DesktopEditor/Qt_build/graphics/project/graphics.pro graphics.file = ../../../DesktopEditor/Qt_build/graphics/project/graphics.pro
cryptopp.file = ../../../Common/3dParty/cryptopp/project/cryptopp.pro
DocxFormatLib.file = ../../../Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro DocxFormatLib.file = ../../../Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
PPTXFormatLib.file = ../../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro PPTXFormatLib.file = ../../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
...@@ -37,6 +40,7 @@ X2tConverter.file = ./X2tConverter.pro ...@@ -37,6 +40,7 @@ X2tConverter.file = ./X2tConverter.pro
X2tConverter.depends = \ X2tConverter.depends = \
OfficeUtils \ OfficeUtils \
graphics \ graphics \
cryptopp \
DocxFormatLib \ DocxFormatLib \
PPTXFormatLib \ PPTXFormatLib \
ASCOfficeDocxFile2Lib \ ASCOfficeDocxFile2Lib \
...@@ -48,40 +52,6 @@ X2tConverter.depends = \ ...@@ -48,40 +52,6 @@ X2tConverter.depends = \
OdfFileWriterLib \ OdfFileWriterLib \
XlsFormatLib XlsFormatLib
############### destination path ############### # for run in qt from this solution
DESTINATION_SDK_PATH = $$PWD/../../../build/lib LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH
DESTINATION_ICU = $$PWD/../../../UnicodeConverter/icubuilds include(../../../Common/3dParty/icu/icu.pri)
win32:contains(QMAKE_TARGET.arch, x86_64):{
DESTINATION_ICU = $$DESTINATION_ICU/win64/bin
CONFIG(debug, debug|release) {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64/DEBUG
} else {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64
}
}
win32:!contains(QMAKE_TARGET.arch, x86_64):{
DESTINATION_ICU = $$DESTINATION_ICU/win32/bin
CONFIG(debug, debug|release) {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32/DEBUG
} else {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32
}
}
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTINATION_ICU = $$DESTINATION_ICU/linux64/usr/local/lib
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTINATION_ICU = $$DESTINATION_ICU/icubuilds/mac/build_release-55-1/lib
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/mac_64
}
LIBS += -L$$DESTINATION_SDK_PATH
LIBS += -L$$DESTINATION_ICU
################################################
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment