Fix mac timers (#170 )

Fix building for xp (#168 )
2026-04-07 13:55:33 +08:00 · 2019-07-09 16:06:10 +03:00 · 2019-07-01 14:03:21 +03:00
3 changed files with 13 additions and 3 deletions
--- a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
+++ b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
@ -45,7 +45,13 @@ core_windows {
 DESTDIR = $$CORE_ROOT_DIR/build/bin/$$CORE_BUILDS_PLATFORM_PREFIX
 ################################################

-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer -lkernel -lgraphics -lUnicodeConverter
+LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics -lUnicodeConverter
+
+build_xp {
+    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
+} else {
+    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
+}

 core_linux {
    LIBS += -ldl
--- a/DesktopEditor/graphics/Timer.h
+++ b/DesktopEditor/graphics/Timer.h
@ -64,7 +64,7 @@ namespace NSTimers
    
    inline static unsigned long getUptimeInMilliseconds()
    {
-#ifdef _IOS
+#if defined(_IOS) || defined(_MAC)
        const int64_t kOneMillion = 1000 * 1000;
        static mach_timebase_info_data_t s_timebase_info;
        
--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@ -101,7 +101,11 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPPTXFormatLib
 #docxformat
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDocxFormatLib
 #doctrenderer
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
+build_xp {
+    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
+} else {
+    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
+}
 #HtmlRenderer
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
Author	SHA1	Message	Date
Oleg Korshul	01499a21f3	Fix mac timers (#170 )	2019-07-09 16:06:10 +03:00
Oleg Korshul	14921ca98d	Fix building for xp (#168 )	2019-07-01 14:03:21 +03:00