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

More MSVC stuff

Browse Source
This commit is contained in:
Mark Watkins 2014-05-09 17:05:54 +10:00
parent 9a40b54f63
commit 79e889d0a6
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gLineChart.cpp
View File

@ -295,8 +295,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
QVector<EventList *> &evec = ci.value(); QVector<EventList *> &evec = ci.value();
num_points = 0; num_points = 0;
int evecsize=evec.size();
for (int i = 0; i < evec.size(); i++) { for (int i = 0; i < evecsize; i++) {
num_points += evec[i]->count(); num_points += evec[i]->count();
} }
@ -306,7 +307,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
// Max number of samples taken from samples per pixel for better min/max values // Max number of samples taken from samples per pixel for better min/max values
const int num_averages = 20; const int num_averages = 20;
int evecsize=evec.size();
for (int n = 0; n < evecsize; ++n) { // for each segment for (int n = 0; n < evecsize; ++n) { // for each segment
EventList &el = *evec[n]; EventList &el = *evec[n];

3
sleepyhead/Graphs/glcommon.cpp
View File

@ -13,9 +13,12 @@
#include "glcommon.h" #include "glcommon.h"
#ifdef BUILD_WITH_MSVC #ifdef BUILD_WITH_MSVC
#if (_MSC_VER < 1800)
double round(double number) double round(double number)
{ {
return number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5); return number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5);
} }
#endif #endif
#endif

5
sleepyhead/Graphs/glcommon.h
View File

@ -61,9 +61,10 @@ const double M_PI = 3.141592653589793;
#endif #endif
#ifdef BUILD_WITH_MSVC #ifdef BUILD_WITH_MSVC
// Visual C++ doesn't have round in it's maths header.. // Visual C++ earlier than 2013 doesn't have round in it's maths header..
#if (_MSC_VER < 1800)
double round(double number); double round(double number);
#endif #endif
#endif
#endif // GLCOMMON_H #endif // GLCOMMON_H

27
sleepyhead/sleepyhead.pro
View File

@ -63,23 +63,20 @@ 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 LIBS += -lsetupapi
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib
} if (*-msvc*):!equals(TEMPLATE_PREFIX, "vc") {
if (win32-msvc2008|win32-msvc2010|win32-msvc2012) { LIBS += -ladvapi32
!equals(TEMPLATE_PREFIX, "vc") { DEFINES += BUILD_WITH_MSVC=1
LIBS += -ladvapi32 } else {
DEFINES += BUILD_WITH_MSVC=1 # MingW needs this
LIBS += -lz
} }
} else {
# MingW needs this
LIBS += -lz
} }
#include(..3rdparty/qextserialport/src/qextserialport.pri) #include(..3rdparty/qextserialport/src/qextserialport.pri)