Skip to content

O
onlyoffice_core
Commit 1e1b546f authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

doctrenderer dynamic library 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60719 954022d7-b5bf-4e40-9824-e11837661b57
parent 2238fda3
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 156 deletions
DesktopEditor/doctrenderer/doctrenderer.h
View file @ 1e1b546f
......@@ -5,6 +5,8 @@
#include "../common/Types.h"
#include "../common/Array.h"
#include <QtCore/qglobal.h>
namespace NSDoctRenderer
{
namespace DoctRendererFormat
......@@ -20,7 +22,7 @@ namespace NSDoctRenderer
};
}
class CExecuteParams
class Q_DECL_EXPORT CExecuteParams
{
public:
DoctRendererFormat::FormatFile m_eSrcFormat;
......@@ -47,7 +49,7 @@ namespace NSDoctRenderer
namespace NSDoctRenderer
{
class CDoctrenderer
class Q_DECL_EXPORT CDoctrenderer
{
private:
CExecuteParams m_oParams;
......
DesktopEditor/doctrenderer/doctrenderer.pro
View file @ 1e1b546f
......@@ -4,19 +4,160 @@
#
#-------------------------------------------------
QT -= core gui
QT -= core
QT -= gui
TARGET = doctrenderer
TEMPLATE = lib
CONFIG += staticlib
CONFIG += static
CONFIG += shared
DEFINES += UNICODE
DEFINES += _UNICODE
DEFINES += _USE_LIBXML2_READER_
DEFINES += LIBXML_READER_ENABLED
linux-g++:contains(QMAKE_HOST.arch, x86_64):{
LIBS += -L../../../../SDK/lib/linux_64 -lgraphics
LIBS += -L../../../../SDK/lib/linux_64 -llibxml2
LIBS += -L../../../../SDK/lib/linux_64 -lv8_base
LIBS += -L../../../../SDK/lib/linux_64 -lv8_libplatform
LIBS += -L../../../../SDK/lib/linux_64 -lv8_libbase
LIBS += -L../../../../SDK/lib/linux_64 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/linux_64 -lv8_snapshot
LIBS += -L../../../../SDK/lib/linux_64 -licui18n
LIBS += -L../../../../SDK/lib/linux_64 -licuuc
LIBS += -L../../../../SDK/lib/linux_64 -licudata
message(linux64)
}
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
LIBS += -L../../../../SDK/lib/linux_32 -lgraphics
LIBS += -L../../../../SDK/lib/linux_32 -llibxml2
LIBS += -L../../../../SDK/lib/linux_32 -lv8_base
LIBS += -L../../../../SDK/lib/linux_32 -lv8_libplatform
LIBS += -L../../../../SDK/lib/linux_32 -lv8_libbase
LIBS += -L../../../../SDK/lib/linux_32 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/linux_32 -lv8_snapshot
LIBS += -L../../../../SDK/lib/linux_32 -licui18n
LIBS += -L../../../../SDK/lib/linux_32 -licuuc
LIBS += -L../../../../SDK/lib/linux_32 -licudata
message(linux32)
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
QT_MAC
LIBS += -L../../../../../../../../../v8/out/native -lv8_base.x64
LIBS += -L../../../../../../../../../v8/out/native -lv8_snapshot
LIBS += -L../../../../../../../../../v8/out/native -lv8_nosnapshot.x64
LIBS += -L../../../../../../../../../v8/out/native -licui18n
LIBS += -L../../../../../../../../../v8/out/native -licuuc
LIBS += -L../../../../../../../../../v8/out/native -licudata
message(mac)
}
win32 {
DEFINES += \
WIN32
LIBS += -lwinmm
LIBS += -ladvapi32
}
win32:contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
LIBS += -L../../../SDK/lib/win_64/DEBUG -lgraphics
LIBS += -L../../../SDK/lib/win_64/DEBUG -llibxml2
LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_libbase
LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_base
LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_nosnapshot
LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_snapshot
LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_libplatform
LIBS += -L../../../SDK/lib/win_64/DEBUG -licui18n
LIBS += -L../../../SDK/lib/win_64/DEBUG -licuuc
} else {
LIBS += -L../../../SDK/lib/win_64 -lgraphics
LIBS += -L../../../SDK/lib/win_64 -llibxml2
LIBS += -L../../../SDK/lib/win_64 -lv8_libbase
LIBS += -L../../../SDK/lib/win_64 -lv8_base
LIBS += -L../../../SDK/lib/win_64 -lv8_nosnapshot
LIBS += -L../../../SDK/lib/win_64 -lv8_snapshot
LIBS += -L../../../SDK/lib/win_64 -lv8_libplatform
LIBS += -L../../../SDK/lib/win_64 -licui18n
LIBS += -L../../../SDK/lib/win_64 -licuuc
}
message(windows64)
}
win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
LIBS += -L../../../SDK/lib/win_32/DEBUG -lgraphics
LIBS += -L../../../SDK/lib/win_32/DEBUG -llibxml2
LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_libbase
LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_base
LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_nosnapshot
LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_snapshot
LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_libplatform
LIBS += -L../../../SDK/lib/win_32/DEBUG -licui18n
LIBS += -L../../../SDK/lib/win_32/DEBUG -licuuc
} else {
LIBS += -L../../../SDK/lib/win_32 -lgraphics
LIBS += -L../../../SDK/lib/win_32 -llibxml2
LIBS += -L../../../SDK/lib/win_32 -lv8_libbase
LIBS += -L../../../SDK/lib/win_32 -lv8_base
LIBS += -L../../../SDK/lib/win_32 -lv8_nosnapshot
LIBS += -L../../../SDK/lib/win_32 -lv8_snapshot
LIBS += -L../../../SDK/lib/win_32 -lv8_libplatform
LIBS += -L../../../SDK/lib/win_32 -licui18n
LIBS += -L../../../SDK/lib/win_32 -licuuc
}
message(windows32)
}
INCLUDEPATH += \
../../../agg-2.4/include \
../../../freetype-2.5.2/include \
../../../../../../../v8_trunk \
../../../../../../../v8_trunk/include \
../../../Common/DocxFormat/Source/XML/libxml2/XML/include
INCLUDEPATH += C:/Qt/Qt5.4.0/5.4/msvc2013_64_opengl/include
SOURCES += doctrenderer.cpp \
../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
../../../Common/DocxFormat/Source/Base/unicode_util.cpp
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
UNICODE \
_UNICODE
}
INCLUDEPATH += \
......@@ -26,8 +167,6 @@ INCLUDEPATH += \
../agg-2.4/include \
../freetype-2.5.2/include
SOURCES += doctrenderer.cpp
HEADERS += doctrenderer.h \
memorystream.h \
nativecontrol.h
......
DesktopEditor/doctrenderer/test/doctrenderer_test.pro
View file @ 1e1b546f
......@@ -4,7 +4,7 @@
#
#-------------------------------------------------
QT += core
QT -= core
QT -= gui
......@@ -13,8 +13,6 @@ CONFIG += console
CONFIG -= app_bundle
DEFINES += _UNICODE
DEFINES += _USE_LIBXML2_READER_
DEFINES += LIBXML_READER_ENABLED
TEMPLATE = app
......@@ -26,146 +24,4 @@ CONFIG(debug, debug|release) {
message(release)
}
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
UNICODE \
_UNICODE
}
linux-g++:contains(QMAKE_HOST.arch, x86_64):{
LIBS += -L../../../../SDK/lib/linux_64 -lgraphics
LIBS += -L../../../../SDK/lib/linux_64 -llibxml2
LIBS += -L../../../../SDK/lib/linux_64 -lv8_base
LIBS += -L../../../../SDK/lib/linux_64 -lv8_libplatform
LIBS += -L../../../../SDK/lib/linux_64 -lv8_libbase
LIBS += -L../../../../SDK/lib/linux_64 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/linux_64 -lv8_snapshot
LIBS += -L../../../../SDK/lib/linux_64 -licui18n
LIBS += -L../../../../SDK/lib/linux_64 -licuuc
LIBS += -L../../../../SDK/lib/linux_64 -licudata
message(linux64)
}
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
LIBS += -L../../../../SDK/lib/linux_32 -lgraphics
LIBS += -L../../../../SDK/lib/linux_32 -llibxml2
LIBS += -L../../../../SDK/lib/linux_32 -lv8_base
LIBS += -L../../../../SDK/lib/linux_32 -lv8_libplatform
LIBS += -L../../../../SDK/lib/linux_32 -lv8_libbase
LIBS += -L../../../../SDK/lib/linux_32 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/linux_32 -lv8_snapshot
LIBS += -L../../../../SDK/lib/linux_32 -licui18n
LIBS += -L../../../../SDK/lib/linux_32 -licuuc
LIBS += -L../../../../SDK/lib/linux_32 -licudata
message(linux32)
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
_MAC \
QT_MAC
LIBS += -L../../../../../../../../../v8/out/native -lv8_base.x64
LIBS += -L../../../../../../../../../v8/out/native -lv8_snapshot
LIBS += -L../../../../../../../../../v8/out/native -lv8_nosnapshot.x64
LIBS += -L../../../../../../../../../v8/out/native -licui18n
LIBS += -L../../../../../../../../../v8/out/native -licuuc
LIBS += -L../../../../../../../../../v8/out/native -licudata
message(mac)
}
win32 {
DEFINES += \
WIN32
DEFINES -= UNICODE
LIBS += -lwinmm
LIBS += -ladvapi32
}
win32:contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lgraphics
LIBS += -L../../../../SDK/lib/win_64/DEBUG -llibxml2
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lv8_libbase
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lv8_base
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lv8_snapshot
LIBS += -L../../../../SDK/lib/win_64/DEBUG -lv8_libplatform
LIBS += -L../../../../SDK/lib/win_64/DEBUG -licui18n
LIBS += -L../../../../SDK/lib/win_64/DEBUG -licuuc
} else {
LIBS += -L../../../../SDK/lib/win_64 -lgraphics
LIBS += -L../../../../SDK/lib/win_64 -llibxml2
LIBS += -L../../../../SDK/lib/win_64 -lv8_libbase
LIBS += -L../../../../SDK/lib/win_64 -lv8_base
LIBS += -L../../../../SDK/lib/win_64 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/win_64 -lv8_snapshot
LIBS += -L../../../../SDK/lib/win_64 -lv8_libplatform
LIBS += -L../../../../SDK/lib/win_64 -licui18n
LIBS += -L../../../../SDK/lib/win_64 -licuuc
}
message(windows64)
}
win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lgraphics
LIBS += -L../../../../SDK/lib/win_32/DEBUG -llibxml2
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lv8_libbase
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lv8_base
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lv8_snapshot
LIBS += -L../../../../SDK/lib/win_32/DEBUG -lv8_libplatform
LIBS += -L../../../../SDK/lib/win_32/DEBUG -licui18n
LIBS += -L../../../../SDK/lib/win_32/DEBUG -licuuc
} else {
LIBS += -L../../../../SDK/lib/win_32 -lgraphics
LIBS += -L../../../../SDK/lib/win_32 -llibxml2
LIBS += -L../../../../SDK/lib/win_32 -lv8_libbase
LIBS += -L../../../../SDK/lib/win_32 -lv8_base
LIBS += -L../../../../SDK/lib/win_32 -lv8_nosnapshot
LIBS += -L../../../../SDK/lib/win_32 -lv8_snapshot
LIBS += -L../../../../SDK/lib/win_32 -lv8_libplatform
LIBS += -L../../../../SDK/lib/win_32 -licui18n
LIBS += -L../../../../SDK/lib/win_32 -licuuc
}
message(windows32)
}
INCLUDEPATH += \
../../../agg-2.4/include \
../../../freetype-2.5.2/include \
../../../../../../../v8_trunk \
../../../../../../../v8_trunk/include \
../../../Common/DocxFormat/Source/XML/libxml2/XML/include
SOURCES += main.cpp \
../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
../../../Common/DocxFormat/Source/Base/unicode_util.cpp
SOURCES += main.cpp
DesktopEditor/doctrenderer/test/main.cpp
View file @ 1e1b546f
......@@ -4,7 +4,7 @@
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
//QCoreApplication a(argc, argv);
#if 1
std::wstring strXml = L"<Settings>\
......@@ -39,5 +39,6 @@ int main(int argc, char *argv[])
std::wstring sError;
oRenderer.Execute(strXml, sError);
return a.exec();
//return a.exec();
return 0;
}
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7