From 9da8b2a7d3767d03553ceb42b8355ec138bb2b51 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 13 Jun 2018 14:17:58 +1000 Subject: [PATCH] Update reading, fix windows build glitch --- README | 12 ++++++------ sleepyhead/SleepLib/common.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index 95405229..ea92510a 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SleepyHead v1.1 branch -*Warning*, backup your SleepyHeadData directory before using this branch as there will be no going backwards +*Warning*: Backup your SleepyHeadData directory before using this branch or start a new profile SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. @@ -11,12 +11,12 @@ SleepyHead is copyright (C) 2011-2018 Mark Watkins Requirements: ------------- -Qt5 SDK with webkit (Qt5.5 from http://qt.io/download-open-source recommended) +Qt5.9 SDK with webkit (Qt5.9 from http://qt.io/download-open-source recommended, and please ONLY use that if you wish to submit bug reports) Linux needs libudev-dev for qserialport to compile -OSX needs Xcode and commandline tools from AppStore +OSX needs Xcode and commandline tools from AppStore, -Windows needs MinGW (in Qt5 SDK) or VC++2013 Express (and matching Qt libraries) +Windows needs MinGW (in Qt5 SDK) or VC++2015 Community, and a matching set of Qt libraries. Building: -------- @@ -30,14 +30,14 @@ qmake ../sleepyhead-code/SleepyHeadQT.pro make You may need to add a -spec option to qmake to suit your platform. -Adding -j3 speeds up the make command on a dual core or greater system. +Adding -j4 speeds up the make command on a dual core or greater system. Building on OSX: --------------- Build as above. If qmake fails with the error: Project ERROR: Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild edit the file: -QT_INSTALL_DIR/5.5/clang_64/mkspecs/features/mac/default_pre.prf +QT_INSTALL_DIR/5.9/clang_64/mkspecs/features/mac/default_pre.prf and replace /usr/bin/xcrun -find xcrun 2>/dev/null diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index 1e244d80..0cd9540a 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -1,4 +1,4 @@ -/* SleepLib Common Functions +/* SleepLib Common Functions * * Copyright (c) 2011-2018 Mark Watkins * @@ -69,7 +69,7 @@ const QString getDefaultAppRoot() bool gfxEgnineIsSupported(GFXEngine e) { -#if Q_OS_WIN32 +#if defined(Q_OS_WIN32) return true; #else switch(e) {