Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
57208914
Commit
57208914
authored
Dec 22, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macOS 10.11
parent
96f7cd90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
+1
-1
DesktopEditor/graphics/Timer.h
DesktopEditor/graphics/Timer.h
+2
-1
OfficeUtils/OfficeUtils.pro
OfficeUtils/OfficeUtils.pro
+1
-1
No files found.
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
View file @
57208914
...
...
@@ -32,7 +32,7 @@ INCLUDEPATH += \
..
/../../
DesktopEditor
/
xml
/
libxml2
/
include
core_mac
{
QMAKE_MAC_SDK
=
macosx10
.
11
#
QMAKE_MAC_SDK
=
macosx10
.
11
}
SOURCES
+=
\
...
...
DesktopEditor/graphics/Timer.h
View file @
57208914
...
...
@@ -80,12 +80,13 @@ namespace NSTimers
}
#endif
// CLOCK_MONOTONIC defined ONLY since macOS 10.12!!! (crash on earlier version)
static
DWORD
GetTickCount
()
{
#if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)
return
::
GetTickCount
();
#else
#if
def CLOCK_MONOTONIC
#if
defined(CLOCK_MONOTONIC) && !defined(_MAC)
struct
timespec
ts
;
clock_gettime
(
CLOCK_MONOTONIC
,
&
ts
);
...
...
OfficeUtils/OfficeUtils.pro
View file @
57208914
...
...
@@ -9,7 +9,7 @@ win32 {
}
mac
{
QMAKE_MAC_SDK
=
macosx10
.
11
#
QMAKE_MAC_SDK
=
macosx10
.
11
}
CORE_ROOT_DIR
=
$$
PWD
/..
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment