From 7e940e3a435e8e3268e97d7c3fca6add65d2592c Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 8 Feb 2018 20:30:58 +0100 Subject: [PATCH] Windows build fixes --- libairspyhf/libairspyhf.pro | 6 ++---- liblimesuite/liblimesuite.pro | 2 +- .../samplesource/airspyhf/{airspyhff.pro => airspyhf.pro} | 0 sdrbase/sdrbase.pro | 4 ++++ 4 files changed, 7 insertions(+), 5 deletions(-) rename plugins/samplesource/airspyhf/{airspyhff.pro => airspyhf.pro} (100%) diff --git a/libairspyhf/libairspyhf.pro b/libairspyhf/libairspyhf.pro index af7592912..0c9efeae6 100644 --- a/libairspyhf/libairspyhf.pro +++ b/libairspyhf/libairspyhf.pro @@ -17,13 +17,11 @@ CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBAIRSPYHFSRC/src/airspyhf.c\ - $$LIBAIRSPYHFSRC/src/iqbalancer.c\ - $$LIBAIRSPYHFSRC/src/iqconverter_int16.c + $$LIBAIRSPYHFSRC/src/iqbalancer.c HEADERS = $$LIBAIRSPYHFSRC/src/airspyhf.h\ $$LIBAIRSPYHFSRC/src/airspyhf_commands.h\ - $$LIBAIRSPYHFSRC/src/iqbalancer.h\ - $$LIBAIRSPYHFSRC/src/iqconverter_int16.h + $$LIBAIRSPYHFSRC/src/iqbalancer.h CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index 32cdee284..0b9f5120b 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -17,7 +17,7 @@ QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" diff --git a/plugins/samplesource/airspyhf/airspyhff.pro b/plugins/samplesource/airspyhf/airspyhf.pro similarity index 100% rename from plugins/samplesource/airspyhf/airspyhff.pro rename to plugins/samplesource/airspyhf/airspyhf.pro diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index ecef3b911..7f55fb758 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -51,6 +51,7 @@ SOURCES += audio/audiodeviceinfo.cpp\ audio/audiofifo.cpp\ audio/audiooutput.cpp\ audio/audioinput.cpp\ + audio/audionetsink.cpp\ channel/channelsinkapi.cpp\ channel/channelsourceapi.cpp\ commands/command.cpp\ @@ -65,6 +66,7 @@ SOURCES += audio/audiodeviceinfo.cpp\ dsp/ctcssdetector.cpp\ dsp/cwkeyer.cpp\ dsp/cwkeyersettings.cpp\ + dsp/decimatorsf.cpp\ dsp/dspcommands.cpp\ dsp/dspengine.cpp\ dsp/dspdevicesourceengine.cpp\ @@ -119,6 +121,7 @@ HEADERS += audio/audiodeviceinfo.h\ audio/audiofifo.h\ audio/audiooutput.h\ audio/audioinput.h\ + audio/audionetsink.h\ channel/channelsinkapi.h\ channel/channelsourceapi.h\ commands/command.h\ @@ -133,6 +136,7 @@ HEADERS += audio/audiodeviceinfo.h\ dsp/cwkeyersettings.h\ dsp/complex.h\ dsp/decimators.h\ + dsp/decimatorsf.h\ dsp/interpolators.h\ dsp/dspcommands.h\ dsp/dspengine.h\