Fixes for new build for Windows 64

This commit is contained in:
f4exb 2017-09-16 04:50:25 +02:00
parent 379330d9a5
commit c92b34202b
12 changed files with 42 additions and 8 deletions

View File

@ -26,8 +26,13 @@
#include <QString>
#include <QFileDialog>
#ifdef _WIN32
#include <nn.h>
#include <pair.h>
#else
#include <nanomsg/nn.h>
#include <nanomsg/pair.h>
#endif
#include "ui_sdrdaemonsourcegui.h"
#include "gui/colormapper.h"

View File

@ -5,9 +5,10 @@
#--------------------------------------------------------
TEMPLATE = subdirs
SUBDIRS = sdrbase
SUBDIRS = serialdv
SUBDIRS += sdrbase
CONFIG(MINGW64)SUBDIRS += nanomsg
SUBDIRS += httpserver
SUBDIRS += fcdhid
SUBDIRS += fcdlib
SUBDIRS += librtlsdr
@ -20,7 +21,6 @@ SUBDIRS += libiio
SUBDIRS += devices
SUBDIRS += mbelib
SUBDIRS += dsdcc
SUBDIRS += serialdv
CONFIG(MINGW64)SUBDIRS += cm256cc
SUBDIRS += plugins/samplesource/filesource
CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource

View File

@ -14,9 +14,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <cmath>
#include <math.h>
#include "dsp/afsquelch.h"
#undef M_PI
#define M_PI 3.14159265358979323846
AFSquelch::AFSquelch() :
m_nbAvg(128),
m_N(0),

View File

@ -4,9 +4,12 @@
* Created on: Jun 16, 2015
* Author: f4exb
*/
#include <cmath>
#include <math.h>
#include "dsp/ctcssdetector.h"
#undef M_PI
#define M_PI 3.14159265358979323846
CTCSSDetector::CTCSSDetector() :
N(0),
sampleRate(0),

View File

@ -5,6 +5,9 @@
#include <math.h>
#include "dsp/dsptypes.h"
#undef M_PI
#define M_PI 3.14159265358979323846
template <class Type> class Lowpass {
public:
Lowpass() : m_ptr(0) { }

View File

@ -24,7 +24,10 @@
#ifndef _MISC_H
#define _MISC_H
#include <cmath>
#include <math.h>
#undef M_PI
#define M_PI 3.14159265358979323846
inline float sinc(float x)
{

View File

@ -21,6 +21,9 @@
#include <math.h>
#include "dsp/nco.h"
#undef M_PI
#define M_PI 3.14159265358979323846
Real NCO::m_table[NCO::TableSize];
bool NCO::m_tableInitialized = false;

View File

@ -20,6 +20,9 @@
#include <math.h>
#include "dsp/ncof.h"
#undef M_PI
#define M_PI 3.14159265358979323846
Real NCOF::m_table[NCOF::TableSize];
bool NCOF::m_tableInitialized = false;

View File

@ -18,6 +18,9 @@
#include <math.h>
#include "dsp/phaselock.h"
#undef M_PI
#define M_PI 3.14159265358979323846
// Construct phase-locked loop.
PhaseLock::PhaseLock(Real freq, Real bandwidth, Real minsignal)
{

View File

@ -14,9 +14,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <cmath>
#include <math.h>
#include "recursivefilters.h"
#undef M_PI
#define M_PI 3.14159265358979323846
SecondOrderRecursiveFilter::SecondOrderRecursiveFilter(float samplingFrequency, float centerFrequency, float r) :
m_r(r),
m_frequencyRatio(centerFrequency/samplingFrequency)

View File

@ -10,7 +10,9 @@
#include "wfir.h"
#define M_2PI 6.28318530717958647692 // M_PI should be in the math.h file
#undef M_PI
#define M_PI 3.14159265358979323846
#define M_2PI 6.28318530717958647692
// This first calculates the impulse response for a rectangular window.
// It then applies the windowing function of choice to the impulse response.

View File

@ -27,6 +27,9 @@
#include <algorithm>
#include <QDebug>
#undef M_PI
#define M_PI 3.14159265358979323846
/*
#ifdef _WIN32
static double log2f(double n)