diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 4efb5856..c294d6ae 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -1057,7 +1057,7 @@ EventDataType Session::physMin(ChannelID id) return 0; } - EventDataType min = round(Min(id)); + EventDataType min = floor(Min(id)); m_physmin[id] = min; return min; } @@ -1077,7 +1077,7 @@ EventDataType Session::physMax(ChannelID id) return 0; } - EventDataType max = round(Max(id) + 0.5); + EventDataType max = ceil(Max(id) + 0.5); m_physmax[id] = max; return max; } diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index cb341f03..0556c796 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -65,13 +65,19 @@ macx { win32 { DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this RC_FILE += win_icon.rc - LIBS += -lsetupapi -lz + LIBS += -lsetupapi + + INCLUDEPATH += $$PWD + INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib + } -if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc") { +if (win32-msvc2008|win32-msvc2010|win32-msvc2012) { +!equals(TEMPLATE_PREFIX, "vc") { LIBS += -ladvapi32 DEFINES += BUILD_WITH_MSVC=1 -} +} +} #include(..3rdparty/qextserialport/src/qextserialport.pri) #include(3rdparty/quazip-0.5.1/quazip/quazip.pri) @@ -235,6 +241,7 @@ win32 { for(FILE,TRANS_FILES_WIN){ system(xcopy /y $$quote($$FILE) $$quote($$DDIR)) } + } mac { diff --git a/sleepyhead/win_icon.rc b/sleepyhead/win_icon.rc index 6f53ae06..b700a656 100644 --- a/sleepyhead/win_icon.rc +++ b/sleepyhead/win_icon.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "/icons/bob-v3.0.ico" +IDI_ICON1 ICON DISCARDABLE "./icons/bob-v3.0.ico"