mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-04-07 13:55:33 +08:00
Fix linux compile
This commit is contained in:
@ -12,7 +12,6 @@ CONFIG += core_static_link_libstd
|
||||
CORE_ROOT_DIR = $$PWD/../../../../core
|
||||
PWD_ROOT_DIR = $$PWD
|
||||
include($$CORE_ROOT_DIR/Common/base.pri)
|
||||
include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
|
||||
|
||||
############### destination path ###############
|
||||
DESTDIR = $$PWD/build
|
||||
@ -29,6 +28,8 @@ DEFINES += "DOCUMENT_BUILDER_INSTALL_PATH=\"$$DOCUMENT_BUILDER_INSTALL_PATH\""
|
||||
LIBS += -L'$$DOCUMENT_BUILDER_INSTALL_PATH' -ldoctrenderer
|
||||
|
||||
core_linux {
|
||||
include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
|
||||
LIBS += -L'$$DOCUMENT_BUILDER_INSTALL_PATH' -lUnicodeConverter -lkernel -lkernel_network -lgraphics
|
||||
LIBS += -ldl
|
||||
}
|
||||
|
||||
|
||||
@ -223,7 +223,7 @@ namespace NSUtils
|
||||
|
||||
std::wstring GetBuilderDirectory()
|
||||
{
|
||||
#define VALUE_TO_STRING(x) L#x
|
||||
#define VALUE_TO_STRING(x) L###x
|
||||
#define VALUE2STR(x) VALUE_TO_STRING(x)
|
||||
|
||||
std::wstring sDirectory = VALUE2STR(DOCUMENT_BUILDER_INSTALL_PATH);
|
||||
|
||||
Reference in New Issue
Block a user