Skip to content

O
onlyoffice_core
Commit 57208914 authored by Oleg Korshul's avatar Oleg Korshul
Browse files
Options

macOS 10.11

parent 96f7cd90
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
View file @ 57208914
...@@ -32,7 +32,7 @@ INCLUDEPATH += \ ...@@ -32,7 +32,7 @@ INCLUDEPATH += \
../../../DesktopEditor/xml/libxml2/include ../../../DesktopEditor/xml/libxml2/include
core_mac { core_mac {
QMAKE_MAC_SDK = macosx10.11 #QMAKE_MAC_SDK = macosx10.11
} }
SOURCES += \ SOURCES += \
......
DesktopEditor/graphics/Timer.h
View file @ 57208914
...@@ -80,12 +80,13 @@ namespace NSTimers ...@@ -80,12 +80,13 @@ namespace NSTimers
} }
#endif #endif
// CLOCK_MONOTONIC defined ONLY since macOS 10.12!!! (crash on earlier version)
static DWORD GetTickCount() static DWORD GetTickCount()
{ {
#if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE) #if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)
return ::GetTickCount(); return ::GetTickCount();
#else #else
#ifdef CLOCK_MONOTONIC #if defined(CLOCK_MONOTONIC) && !defined(_MAC)
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
......
OfficeUtils/OfficeUtils.pro
View file @ 57208914
...@@ -9,7 +9,7 @@ win32 { ...@@ -9,7 +9,7 @@ win32 {
} }
mac { mac {
QMAKE_MAC_SDK = macosx10.11 #QMAKE_MAC_SDK = macosx10.11
} }
CORE_ROOT_DIR = $$PWD/.. CORE_ROOT_DIR = $$PWD/..
......
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