pengjunjie/desktop-sdk
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-sdk.git synced 2026-03-31 10:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix previous commit

Browse Source
This commit is contained in:
Oleg Korshul
2018-07-18 17:26:29 +03:00
parent f59cd24d74
commit bc8c7d03eb
2 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
HtmlFile/Internal/Internal.pro
View File

@ -9,26 +9,14 @@ 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)
include($$CORE_ROOT_DIR/Common/3dParty/curl/curl.pri)
include($$CORE_ROOT_DIR/../desktop-sdk/ChromiumBasedEditors/lib/AscDocumentsCore_base.pri)
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -llibxml -lOfficeUtils -lUnicodeConverter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
core_windows {
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics
SOURCES += $$CORE_ROOT_DIR/Common/FileDownloader/FileDownloader_win.cpp
}
core_linux {
include($$CORE_ROOT_DIR/DesktopEditor/Qt_build/graphics/project/graphics.pri)
SOURCES += $$CORE_ROOT_DIR/Common/FileDownloader/FileDownloader_curl.cpp
}
DESTDIR=$$CORE_BUILDS_LIBRARIES_PATH
INCLUDEPATH += \
$$CORE_ROOT_DIR/DesktopEditor/agg-2.4/include \
$$CORE_ROOT_DIR/DesktopEditor/freetype-2.5.2/include
HEADERS += \
$$PWD/src/clienthandler.h \
$$PWD/src/client_app.h
@ -47,7 +35,7 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += link_pkgconfig c++11
PKGCONFIG += glib-2.0 gdk-2.0 gtkglext-1.0 atk cairo gtk+-unix-print-2.0
LIBS += -lcurl -lz
LIBS += -lz
#CONFIG += build_for_centos6
@ -56,11 +44,11 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
build_for_centos6 {
core_linux_64 {
QMAKE_LFLAGS += -Wl,--dynamic-linker=./ld-linux-x86-64.so.2
} else {
QMAKE_LFLAGS += -Wl,--dynamic-linker=./ld-linux.so.2
}
DESTDIR = $$DESTDIR/CentOS6
core_linux_64 {
QMAKE_LFLAGS += -Wl,--dynamic-linker=./ld-linux-x86-64.so.2
} else {
QMAKE_LFLAGS += -Wl,--dynamic-linker=./ld-linux.so.2
}
DESTDIR = $$DESTDIR/CentOS6
}
}

5
HtmlFile/Internal/src/main.cpp
View File

@ -31,11 +31,6 @@
*/
#include "../../../core/DesktopEditor/common/File.h"
#ifdef CreateDirectory
#undef CreateDirectory
#endif
#include "../../../core/DesktopEditor/common/Directory.h"
#include "../../../core/DesktopEditor/xml/include/xmlutils.h"