Commit 57208914 authored by Oleg Korshul's avatar Oleg Korshul

macOS 10.11

parent 96f7cd90
......@@ -32,7 +32,7 @@ INCLUDEPATH += \
../../../DesktopEditor/xml/libxml2/include
core_mac {
QMAKE_MAC_SDK = macosx10.11
#QMAKE_MAC_SDK = macosx10.11
}
SOURCES += \
......
......@@ -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
#ifdef CLOCK_MONOTONIC
#if defined(CLOCK_MONOTONIC) && !defined(_MAC)
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
......
......@@ -9,7 +9,7 @@ win32 {
}
mac {
QMAKE_MAC_SDK = macosx10.11
#QMAKE_MAC_SDK = macosx10.11
}
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