VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 08:54:49 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
f4exb
2019-04-18 23:31:42 +02:00
parent 924e54118c c6333156fb
commit 387c5a0e3b
36 changed files with 348 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/CMakeLists.txt
+2 -2
View File
@@ -29,10 +29,10 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerf2input)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if(LIBUSB_FOUND)
if(LIBUSB_FOUND AND NOT APPLE)
add_subdirectory(fcdpro)
add_subdirectory(fcdproplus)
endif()
endif(LIBUSB_FOUND AND NOT APPLE)
find_package(LibHACKRF)
if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
plugins/samplesource/remoteinput/remoteinputbuffer.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QString>
#include <QDebug>
#include <cstdlib>
#include "cm256.h"
#include "cm256cc/cm256.h"
#include "util/movingaverage.h"