pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feature/pr2 prsettings (#70)

Browse Source 
* [win-nix] added base.pri dependency

* [win-nix] added options to open document of specific type

* [macos] Added options to open document of specific type

Co-authored-by: Alexander Yuzhin <alexander.yuzhin@onlyoffice.com>
This commit is contained in:
maxkadushkin
2020-01-16 15:46:06 +03:00
committed by Alexey Golubev
parent 734ef0e7a8
commit 62f83bba77
15 changed files with 156 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
win-linux/defaults.pri
View File

@ -1,5 +1,6 @@
QT += core gui widgets gui-private widgets-private core-private printsupport
QT += multimedia multimediawidgets
QT += svg
TEMPLATE = app
@ -18,22 +19,17 @@ TRANSLATIONS = ./langs/en.ts \
./langs/zh_CN.ts \
./langs/pl.ts
CORE_SRC_PATH = $$PWD/../../core/DesktopEditor
CORE_ROOT_DIR = $$PWD/../../core
BASEEDITORS_PATH = $$PWD/../../desktop-sdk/ChromiumBasedEditors
CORE_3DPARTY_PATH = $$PWD/../../core/Common/3dParty
use_branding {
CORE_LIB_PATH = $$PWD/../../core/build/$$BRANDING_PATH_EXTENSION
} else {
CORE_LIB_PATH = $$PWD/../../core/build
}
OBJECTS_DIR = ./obj
MOC_DIR = ./moc
RCC_DIR = ./rcc
CONFIG += core_no_dst
include($$CORE_ROOT_DIR/Common/base.pri)
INCLUDEPATH += $$BASEEDITORS_PATH/lib/include \
$$BASEEDITORS_PATH/lib/qcefview \
$$CORE_SRC_PATH
INCLUDEPATH += \
$$BASEEDITORS_PATH/lib/include \
$$BASEEDITORS_PATH/lib/qcefview \
$$CORE_ROOT_DIR/DesktopEditor
HEADERS += \
$$BASEEDITORS_PATH/lib/qcefview/qcefview.h \
@ -128,69 +124,22 @@ ENV_PRODUCT_VERSION = $$(PRODUCT_VERSION)
VER_PRODUCT_VERSION_COMMAS=$$replace(FULL_PRODUCT_VERSION, \., ",")
}
linux-g++ {
CONFIG += app_linux
linux-g++:contains(QMAKE_HOST.arch, x86_64): {
CONFIG += app_linux_64
PLATFORM_BUILD = linux_64
}
linux-g++:!contains(QMAKE_HOST.arch, x86_64): {
CONFIG += app_linux_32
PLATFORM_BUILD = linux_32
}
}
PLATFORM_BUILD=$$CORE_BUILDS_PLATFORM_PREFIX
linux-g++-64 {
CONFIG += app_linux
CONFIG += app_linux_64
PLATFORM_BUILD = linux_64
}
linux-g++-32 {
CONFIG += app_linux
CONFIG += app_linux_32
PLATFORM_BUILD = linux_32
}
# cef
core_windows:LIBS += -L$$CORE_3DPARTY_PATH/cef/$$PLATFORM_BUILD/build -llibcef
core_linux:LIBS += -L$$CORE_3DPARTY_PATH/cef/$$PLATFORM_BUILD/build -lcef
win32 {
CONFIG -= debug_and_release debug_and_release_target
# core
ADD_DEPENDENCY(PdfReader, PdfWriter, DjVuFile, XpsFile, HtmlRenderer, UnicodeConverter, hunspell, ooxmlsignature, kernel, graphics, videoplayer, ascdocumentscore)
contains(QMAKE_TARGET.arch, x86_64):{
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02
PLATFORM_BUILD = win_64
} else {
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
PLATFORM_BUILD = win_32
}
}
CORE_LIB_PATH_PLATFORM=$$CORE_LIB_PATH/lib/$$PLATFORM_BUILD
win32 {
CONFIG(debug, debug|release) {
CORE_LIB_PATH_PLATFORM=$$CORE_LIB_PATH_PLATFORM/DEBUG
LIBS += -L$$CORE_3DPARTY_PATH/cef/$$PLATFORM_BUILD/build
}
}
LIBS += -L$$CORE_LIB_PATH_PLATFORM -lPdfReader -lPdfWriter -lDjVuFile -lXpsFile -lHtmlRenderer -lUnicodeConverter -lhunspell -looxmlsignature -lkernel -lgraphics
INCLUDEPATH += ../../core-ext/desktop-sdk-wrapper/additional
QT += multimedia multimediawidgets
build_xp {
LIBS += -L$$CORE_LIB_PATH_PLATFORM/xp -lvideoplayer
} else {
LIBS += -L$$CORE_LIB_PATH_PLATFORM -lvideoplayer
}
app_linux {
core_linux {
QT += network x11extras
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN/converter\'"
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
LIBS += -L$$PWD/$$CORE_3DPARTY_PATH/cef/$$PLATFORM_BUILD/build -lcef
HEADERS += $$PWD/src/linux/cmainwindow.h \
$$PWD/src/linux/cx11decoration.h \
$$PWD/src/linux/csinglewindow.h \
@ -206,22 +155,17 @@ app_linux {
HEADERS += $$PWD/src/linux/cdialogopenssl.h
SOURCES += $$PWD/src/linux/cdialogopenssl.cpp
DEFINES += LINUX _LINUX
CONFIG += link_pkgconfig
PKGCONFIG += glib-2.0 gdk-2.0 atk cairo gtk+-unix-print-2.0
LIBS += -lX11
LIBS += -L$$CORE_3DPARTY_PATH/cef/$$PLATFORM_BUILD/build -lcef
LIBS += $$CORE_3DPARTY_PATH/icu/$$PLATFORM_BUILD/build/libicuuc.so.58
LIBS += $$CORE_3DPARTY_PATH/icu/$$PLATFORM_BUILD/build/libicudata.so.58
DEFINES += DOCUMENTSCORE_OPENSSL_SUPPORT
}
win32 {
DEFINES += JAS_WIN_MSVC_BUILD WIN32
DEFINES += WIN32
core_windows {
DEFINES += Q_COMPILER_INITIALIZER_LISTS
RC_ICONS += ./res/icons/desktop_icons.ico
@ -275,14 +219,18 @@ win32 {
# -lOpenGL32
}
TARGET = $$join(TARGET,,,_$$PLATFORM_BUILD)
OBJECTS_DIR = $$join(OBJECTS_DIR,,./$$PLATFORM_BUILD/,)
MOC_DIR = $$join(MOC_DIR,,./$$PLATFORM_BUILD/,)
RCC_DIR = $$join(RCC_DIR,,./$$PLATFORM_BUILD/,)
core_release:DESTDIR = $$PWD/build
core_debug:DESTDIR = $$PWD/build/debug
win32:build_xp {
TARGET = $$join(TARGET,,,_xp)
OBJECTS_DIR = $$replace(OBJECTS_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
MOC_DIR = $$replace(MOC_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
RCC_DIR = $$replace(RCC_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
!isEmpty(OO_BUILD_BRANDING) {
DESTDIR = $$DESTDIR/$$OO_BUILD_BRANDING
}
DESTDIR = $$DESTDIR/$$PLATFORM_BUILD
build_xp {
DESTDIR = $$DESTDIR/xp
}
OBJECTS_DIR = $$DESTDIR/obj
MOC_DIR = $$DESTDIR/moc
RCC_DIR = $$DESTDIR/rcc