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 compile errors

Browse Source
This commit is contained in:
Oleg Korshul
2019-02-19 20:20:46 +03:00
parent 7b513520f6
commit 662b97019c
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChromiumBasedEditors/lib/AscDocumentsCore_base.pri
View File

@ -588,7 +588,7 @@ HEADERS += \
$$CEF_SRC_PATH/tests/cefclient/browser/main_context.h \
$$CEF_SRC_PATH/tests/cefclient/browser/main_context_impl.h \
$$CEF_SRC_PATH/tests/cefclient/browser/osr_dragdrop_events.h \
$$CEF_SRC_PATH/tests/cefclient/browser/osr_renderer.h \
#$$CEF_SRC_PATH/tests/cefclient/browser/osr_renderer.h \
$$CEF_SRC_PATH/tests/cefclient/browser/preferences_test.h \
$$CEF_SRC_PATH/tests/cefclient/browser/resource.h \
$$CEF_SRC_PATH/tests/cefclient/browser/response_filter_test.h \
@ -614,7 +614,7 @@ SOURCES += \
$$CEF_SRC_PATH/tests/cefclient/browser/drm_test.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/main_context.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/main_context_impl.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/osr_renderer.cc \
#$$CEF_SRC_PATH/tests/cefclient/browser/osr_renderer.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/preferences_test.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/response_filter_test.cc \
$$CEF_SRC_PATH/tests/cefclient/browser/root_window.cc \

4
ChromiumBasedEditors/lib/src/cef/linux/tests/cefclient/browser/root_window_gtk.cc
View File

@ -13,7 +13,9 @@
#include "include/base/cef_bind.h"
#include "include/cef_app.h"
#ifndef NO_CSR
#include "tests/cefclient/browser/browser_window_osr_gtk.h"
#endif
#include "tests/cefclient/browser/browser_window_std_gtk.h"
#include "tests/cefclient/browser/main_context.h"
#include "tests/cefclient/browser/resource.h"
@ -235,9 +237,11 @@ bool RootWindowGtk::WithExtension() const {
void RootWindowGtk::CreateBrowserWindow(const std::string& startup_url) {
if (with_osr_) {
#ifndef NO_CSR
OsrRenderer::Settings settings = {};
MainContext::Get()->PopulateOsrSettings(&settings);
browser_window_.reset(new BrowserWindowOsrGtk(this, startup_url, settings));
#endif
} else {
browser_window_.reset(new BrowserWindowStdGtk(this, startup_url));
}

16
HtmlFile/Internal/Internal.pro
View File

@ -16,6 +16,8 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
DESTDIR=$$CORE_BUILDS_LIBRARIES_PATH
DEFINES += NO_CSR
HEADERS += \
$$PWD/src/clienthandler.h \
$$PWD/src/client_app.h
@ -33,20 +35,10 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
include($$CORE_ROOT_DIR/../desktop-sdk/ChromiumBasedEditors/lib/AscDocumentsCore_linux.pri)
CONFIG += link_pkgconfig c++11
PKGCONFIG += glib-2.0 gdk-2.0 gtkglext-1.0 atk cairo gtk+-unix-print-2.0
#CONFIG += build_for_centos6
PKGCONFIG += glib-2.0 gdk-2.0 atk cairo gtk+-unix-print-2.0
LIBS += -lX11
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN/converter\'"
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
}
}