pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add frameworks build support

Browse Source
This commit is contained in:
Oleg Korshul
2019-12-05 18:15:23 +03:00
parent 3012252048
commit 26a9eda4ea
14 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Common/base.pri
View File

@ -309,3 +309,17 @@ core_ios {
}
}
}
defineTest(ADD_DEPENDENCY) {
libs = $$ARGS
for(lib, libs) {
CORE_BUILDS_LIBRARIES_PATH_DST=$$CORE_BUILDS_LIBRARIES_PATH
build_xp {
isEqual(lib, doctrenderer):CORE_BUILDS_LIBRARIES_PATH_DST=$$CORE_BUILDS_LIBRARIES_PATH/xp
}
!bundle_dylibs:LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH_DST -l$$lib
bundle_dylibs:LIBS += -F$$CORE_BUILDS_LIBRARIES_PATH_DST -framework $$lib
}
export(LIBS)
}

2
DesktopEditor/AllFontsGen/AllFontsGen.pro
View File

@ -15,7 +15,7 @@ TARGET = allfontsgen
DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics -lkernel -lUnicodeConverter
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
core_windows {
DEFINES += \

8
DesktopEditor/allthemesgen/allthemesgen.pro
View File

@ -15,13 +15,7 @@ TARGET = allthemesgen
DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics -lkernel -lUnicodeConverter
build_xp {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
} else {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
}
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, doctrenderer)
core_windows {
DEFINES -= UNICODE

8
DesktopEditor/doctrenderer/app_builder/docbuilder.pro
View File

@ -45,13 +45,7 @@ core_windows {
DESTDIR = $$CORE_BUILDS_BINARY_PATH
################################################
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics -lUnicodeConverter
build_xp {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
} else {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
}
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, doctrenderer)
core_linux {
LIBS += -ldl

2
DesktopEditor/doctrenderer/doctrenderer.pro
View File

@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/../..
PWD_ROOT_DIR = $$PWD
include(../../Common/base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
#CONFIG += build_xp

2
DesktopEditor/graphics/pro/graphics.pro
View File

@ -19,7 +19,7 @@ CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
include(../../../Common/base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel
ADD_DEPENDENCY(UnicodeConverter, kernel)
DEFINES += \
_QT \

2
DesktopEditor/xmlsec/src/ooxmlsignature.pro
View File

@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/../../..
PWD_ROOT_DIR = $$PWD
include($$CORE_ROOT_DIR/Common/base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel
ADD_DEPENDENCY(kernel)
DEFINES -= UNICODE

4
DjVuFile/DjVuFile.pro
View File

@ -15,9 +15,7 @@ CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD
include(../Common/base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter -lUnicodeConverter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter)
DEFINES -= \
UNICODE \

2
HtmlFile/HtmlFile.pro
View File

@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD
include(../Common/base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel
ADD_DEPENDENCY(kernel, UnicodeConverter)
core_linux {
DEFINES += asc_static_link_libstd

3
HtmlRenderer/htmlrenderer.pro
View File

@ -16,8 +16,7 @@ CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD
include(../Common/base.pri)
#UnicodeConverter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
core_windows {
LIBS += -lgdi32 \

3
PdfReader/PdfReader.pro
View File

@ -15,9 +15,8 @@ include(../Common/base.pri)
DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, HtmlRenderer)
DEFINES += CRYPTOPP_DISABLE_ASM
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib

2
PdfWriter/PdfWriter.pro
View File

@ -15,7 +15,7 @@ include(../Common/base.pri)
DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
DEFINES += CRYPTOPP_DISABLE_ASM
LIBS += -lCryptoPPLib

22
X2tConverter/build/Qt/X2tConverter.pri
View File

@ -51,7 +51,6 @@ DEFINES += FILE_FORMAT_CHECKER_WITH_MACRO
DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
INCLUDEPATH += $$PWD/../../../Common/DocxFormat
DEPENDPATH += $$PWD/../../../Common/DocxFormat
@ -92,32 +91,19 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPptFormatLib
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lRtfFormatLib
#txt(xml) file
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lTxtXmlFormatLib
# pdf writer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
#docxfile2
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lASCOfficeDocxFile2Lib
#pptxformat
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPPTXFormatLib
#docxformat
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDocxFormatLib
#doctrenderer
build_xp {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
} else {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
}
#HtmlRenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDjVuFile
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXpsFile
#HtmlFile
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlFile
#UnicodeConverter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter
#Crypto++
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib
#All dynamic libs
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter, PdfReader, HtmlFile, XpsFile, DjVuFile, HtmlRenderer, doctrenderer)
#####################################################
# внешнее подключение сторонних библиотек

4
XpsFile/XpsFile.pro
View File

@ -14,9 +14,7 @@ PWD_ROOT_DIR = $$PWD
include(../Common/base.pri)
DEFINES += XPS_USE_DYNAMIC_LIBRARY
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter)
core_windows {
LIBS += -lgdi32 \