From da8857e0e16f50bfeb533a8c0761450e83d041e8 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 23 Sep 2017 17:19:58 +0200 Subject: [PATCH] Windows build fixes --- app/app.pro | 1 + plugins/channelrx/demodbfm/rdsdemod.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/app.pro b/app/app.pro index 3f1f6e185..bdd7bf26e 100644 --- a/app/app.pro +++ b/app/app.pro @@ -6,6 +6,7 @@ QT += core gui multimedia opengl greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QMAKE_CXXFLAGS += -std=c++11 TEMPLATE = app TARGET = sdrangel diff --git a/plugins/channelrx/demodbfm/rdsdemod.cpp b/plugins/channelrx/demodbfm/rdsdemod.cpp index 97c1a21bb..32292f32b 100644 --- a/plugins/channelrx/demodbfm/rdsdemod.cpp +++ b/plugins/channelrx/demodbfm/rdsdemod.cpp @@ -22,6 +22,10 @@ #include #include +#undef M_PI +#define M_PI 3.14159265358979323846 +#undef M_PI_2 +#define M_PI_2 1.57079632679489661923 const Real RDSDemod::m_pllBeta = 50; const Real RDSDemod::m_fsc = 1187.5; @@ -77,7 +81,7 @@ bool RDSDemod::process(Real demod, bool& bit) m_parms.clock_offset = 0; }*/ - m_parms.subcarr_phi += (2 * M_PI * m_fsc) / (Real) m_srate; + m_parms.subcarr_phi += (2 * M_PI * m_fsc) / (Real) m_srate; m_parms.clock_phi = m_parms.subcarr_phi + m_parms.clock_offset; // Clock phase recovery