pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Oleg.Korshul
2020-12-02 11:03:43 +03:00
parent a521c65c02
commit f3ba3ce3be
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Common/3dParty/v8/v8.pri
View File

@ -1,16 +1,14 @@
#CONFIG += v8_version_87
CORE_V8_PATH_OVERRIDE=$$PWD
v8_version_87 {
CORE_V8_PATH_INCLUDE = /Users/nctdevices/Desktop/GIT_DEVELOP_MAC/v8/v8
CORE_V8_PATH_LIBS = $$CORE_V8_PATH_INCLUDE/out.gn/$$CORE_BUILDS_PLATFORM_PREFIX/obj
CONFIG += c++14
CONFIG += use_v8_monolith
DEFINES += V8_VERSION_87_PLUS
DEFINES += V8_COMPRESS_POINTERS
} else {
CORE_V8_PATH_INCLUDE = $$PWD/v8
CORE_V8_PATH_LIBS = $$CORE_V8_PATH_INCLUDE/out.gn/$$CORE_BUILDS_PLATFORM_PREFIX/obj
}
CORE_V8_PATH_INCLUDE = $$CORE_V8_PATH_OVERRIDE/v8
CORE_V8_PATH_LIBS = $$CORE_V8_PATH_INCLUDE/out.gn/$$CORE_BUILDS_PLATFORM_PREFIX/obj
INCLUDEPATH += \
$$CORE_V8_PATH_INCLUDE \
$$CORE_V8_PATH_INCLUDE/include
@ -18,8 +16,12 @@ INCLUDEPATH += \
core_windows {
CORE_V8_PATH_LIBS = $$CORE_V8_PATH_INCLUDE/out.gn/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX/obj
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_base -lv8_libplatform -lv8_libbase -lv8_snapshot -lv8_libsampler
LIBS += -L$$CORE_V8_PATH_LIBS/third_party/icu -licui18n -licuuc
use_v8_monolith {
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_monolith
} else {
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_base -lv8_libplatform -lv8_libbase -lv8_snapshot -lv8_libsampler
LIBS += -L$$CORE_V8_PATH_LIBS/third_party/icu -licui18n -licuuc
}
LIBS += -lwinmm
LIBS += -ladvapi32
@ -30,18 +32,22 @@ core_windows {
}
core_linux {
SNAPSHOT_LIB=v8_snapshot
!exists($$CORE_V8_PATH_LIBS/libv8_snapshot.a) {
SNAPSHOT_LIB=v8_nosnapshot
}
use_v8_monolith {
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_monolith
} else {
SNAPSHOT_LIB=v8_snapshot
!exists($$CORE_V8_PATH_LIBS/libv8_snapshot.a) {
SNAPSHOT_LIB=v8_nosnapshot
}
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_base -lv8_libplatform -lv8_libbase -l$$SNAPSHOT_LIB -lv8_libsampler
LIBS += -L$$CORE_V8_PATH_LIBS/third_party/icu -licui18n -licuuc
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_base -lv8_libplatform -lv8_libbase -l$$SNAPSHOT_LIB -lv8_libsampler
LIBS += -L$$CORE_V8_PATH_LIBS/third_party/icu -licui18n -licuuc
}
}
core_mac {
v8_version_87 {
use_v8_monolith {
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_monolith
} else {
LIBS += -L$$CORE_V8_PATH_LIBS -lv8_base -lv8_libplatform -lv8_libbase -lv8_snapshot -lv8_libsampler

4
DesktopEditor/doctrenderer/doctrenderer.pro
View File

@ -20,7 +20,7 @@ ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
#CONFIG += build_xp
#core_mac:CONFIG += use_javascript_core
core_mac:CONFIG += use_javascript_core
core_ios {
CONFIG += doct_renderer_empty
@ -89,6 +89,8 @@ SOURCES += \
embed/jsc/jsc_NativeControl.mm \
embed/jsc/jsc_NativeBuilder.mm
QMAKE_OBJECTIVE_CFLAGS += -fobjc-arc -fobjc-weak
LIBS += -framework Foundation
LIBS += -framework JavaScriptCore
}