chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC++ build fixes

Browse Source
This commit is contained in:
Mark Watkins 2014-05-08 14:09:05 +10:00
parent ee73925259
commit 97c1375837
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/SleepLib/session.cpp
View File

@ -1057,7 +1057,7 @@ EventDataType Session::physMin(ChannelID id)
return 0; return 0;
} }
EventDataType min = round(Min(id)); EventDataType min = floor(Min(id));
m_physmin[id] = min; m_physmin[id] = min;
return min; return min;
} }
@ -1077,7 +1077,7 @@ EventDataType Session::physMax(ChannelID id)
return 0; return 0;
} }
EventDataType max = round(Max(id) + 0.5); EventDataType max = ceil(Max(id) + 0.5);
m_physmax[id] = max; m_physmax[id] = max;
return max; return max;
} }

13
sleepyhead/sleepyhead.pro
View File

@ -65,13 +65,19 @@ macx {
win32 { win32 {
DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this
RC_FILE += win_icon.rc 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 LIBS += -ladvapi32
DEFINES += BUILD_WITH_MSVC=1 DEFINES += BUILD_WITH_MSVC=1
}
}
}
#include(..3rdparty/qextserialport/src/qextserialport.pri) #include(..3rdparty/qextserialport/src/qextserialport.pri)
#include(3rdparty/quazip-0.5.1/quazip/quazip.pri) #include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
@ -235,6 +241,7 @@ win32 {
for(FILE,TRANS_FILES_WIN){ for(FILE,TRANS_FILES_WIN){
system(xcopy /y $$quote($$FILE) $$quote($$DDIR)) system(xcopy /y $$quote($$FILE) $$quote($$DDIR))
} }
} }
mac { mac {

2
sleepyhead/win_icon.rc
View File

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "/icons/bob-v3.0.ico" IDI_ICON1 ICON DISCARDABLE "./icons/bob-v3.0.ico"