Merge branch 'master' into dev

apple/deploy.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+SDRANGEL_VERSION="4.3.2"
 QT_VERSION="5.12.0"
 QT_HOME="/Applications/Qt/${QT_VERSION}"
 
@@ -28,6 +29,11 @@ dply_plugin()
 	echo "DeployPLUGIN: `basename $1` to ${plugin_path}"
 }
 
+add_dmg_entry()
+{
+	cp -fv $1 "${DMG_MPATH}/${2}"
+}
+
 # 1st-pass: Gather libs & plugins
 for i in `find . -name '*.dylib' -type f -not -path "./${APP_PATH}/*"`; do 
 	if [[ $i == *"plugins/"* ]]; then
@@ -54,6 +60,26 @@ pwd
 	-libpath=SDRangel.app/Contents/Frameworks \
 	-verbose=1
 
-# Publish DMG
+# Add other files to DMG
+DMG_SRC="SDRangel.dmg"
+DMG_RW_SRC=${DMG_SRC/.dmg/.rw.dmg}
+DMG_TMP_A="/tmp/_dmg-attach"
+hdiutil pmap $DMG_SRC
+hdiutil convert $DMG_SRC -format UDRW -o $DMG_RW_SRC
+#hdiutil resize -limits $DMG_RW_SRC
+hdiutil attach $DMG_RW_SRC > $DMG_TMP_A
+DMG_MPATH=`cat $DMG_TMP_A | grep Volumes | awk '{ print $3 }'`
 
-# ...
+# Append files into filesystem
+add_dmg_entry ../../../libiio/build/libiio-0.14.g17b73d3.pkg
+add_dmg_entry ../../sdrangel/ReadmeMacOS.md
+
+hdiutil detach $DMG_MPATH
+# Publish version
+VERIMAGIC="-v${SDRANGEL_VERSION}_`date +%Y%m%d_%H%M%S`-Qt${QT_VERSION}"
+DMG_DEPLOY=${DMG_SRC/.dmg/${VERIMAGIC}.dmg}
+hdiutil convert $DMG_RW_SRC -format UDRW -o $DMG_DEPLOY
+rm -f $DMG_RW_SRC
+
+echo "DeployedDMG: ${DMG_DEPLOY}"
+exit 0

devices/devices.pro

@@ -23,20 +23,20 @@ CONFIG(MSVC):DEFINES += devices_EXPORTS
 CONFIG(MINGW32):LIBBLADERF = "C:\Programs\bladeRF"
 CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF"
 
-CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
 CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
 CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host"
 CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
 
-CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0"
 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
 CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0"
 
 CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
+CONFIG(macx):LIBPERSEUSSRC = "../../../libperseus-sdr"
 
-CONFIG(macx):LIBIIOSRC = "../../../libiio"
 CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio"
 CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio"
+CONFIG(macx):LIBIIOSRC = "../../../libiio"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../exports
@@ -45,7 +45,12 @@ INCLUDEPATH += "C:\softs\boost_1_66_0"
 INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 INCLUDEPATH += $$LIBBLADERF/include
 INCLUDEPATH += $$LIBHACKRFSRC
-
+macx {
+    INCLUDEPATH += "../../../boost_1_69_0"
+    INCLUDEPATH += "/Library/Frameworks/iio.framework/Headers/"
+    INCLUDEPATH += "/usr/local/include"
+    INCLUDEPATH += "/opt/local/include"
+}
 MINGW32 || MINGW64 || macx {
     INCLUDEPATH += ../liblimesuite/srcmw
     INCLUDEPATH += $$LIBLIMESUITESRC/src
@@ -116,25 +121,6 @@ MINGW32 || MINGW64 {
             plutosdr/deviceplutosdrshared.h
 }
 
-macx {
-    SOURCES += hackrf/devicehackrf.cpp\
-            hackrf/devicehackrfvalues.cpp\
-            hackrf/devicehackrfshared.cpp
-
-    SOURCES += limesdr/devicelimesdr.cpp\
-            limesdr/devicelimesdrparam.cpp\
-            limesdr/devicelimesdrshared.cpp
-
-    HEADERS  += hackrf/devicehackrf.h\
-            hackrf/devicehackrfparam.h\
-            hackrf/devicehackrfvalues.h\
-            hackrf/devicehackrfshared.h
-
-    HEADERS += limesdr/devicelimesdr.h\
-            limesdr/devicelimesdrparam.h\
-            limesdr/devicelimesdrshared.h
-}
-
 MSVC {
     SOURCES += bladerf1/devicebladerf1.cpp\
             bladerf1/devicebladerf1values.cpp\
@@ -191,6 +177,68 @@ MSVC {
             plutosdr/deviceplutosdrshared.h
 }
 
+macx {
+    SOURCES += bladerf1/devicebladerf1.cpp\
+            bladerf1/devicebladerf1values.cpp\
+            bladerf1/devicebladerf1shared.cpp
+
+    SOURCES += bladerf2/devicebladerf2.cpp\
+            bladerf2/devicebladerf2shared.cpp
+
+    SOURCES += hackrf/devicehackrf.cpp\
+            hackrf/devicehackrfvalues.cpp\
+            hackrf/devicehackrfshared.cpp
+
+    SOURCES += limesdr/devicelimesdr.cpp\
+            limesdr/devicelimesdrparam.cpp\
+            limesdr/devicelimesdrshared.cpp
+
+    SOURCES += soapysdr/devicesoapysdr.cpp\
+            soapysdr/devicesoapysdrparams.cpp\
+            soapysdr/devicesoapysdrscan.cpp\
+            soapysdr/devicesoapysdrshared.cpp
+
+    SOURCES += plutosdr/deviceplutosdr.cpp\
+            plutosdr/deviceplutosdrbox.cpp\
+            plutosdr/deviceplutosdrparams.cpp\
+            plutosdr/deviceplutosdrscan.cpp\
+            plutosdr/deviceplutosdrshared.cpp
+
+    SOURCES += perseus/deviceperseus.cpp\
+            perseus/deviceperseusscan.cpp
+
+    HEADERS += bladerf1/devicebladerf1.h\
+            bladerf1/devicebladerf1param.h\
+            bladerf1/devicebladerf1values.h\
+            bladerf1/devicebladerf1shared.h
+
+    HEADERS += bladerf2/devicebladerf2.h\
+            bladerf2/devicebladerf2shared.h
+
+    HEADERS  += hackrf/devicehackrf.h\
+            hackrf/devicehackrfparam.h\
+            hackrf/devicehackrfvalues.h\
+            hackrf/devicehackrfshared.h
+
+    HEADERS += limesdr/devicelimesdr.h\
+            limesdr/devicelimesdrparam.h\
+            limesdr/devicelimesdrshared.h
+
+    HEADERS += soapysdr/devicesoapysdr.h\
+            soapysdr/devicesoapysdrparams.h\
+            soapysdr/devicesoapysdrscan.h\
+            soapysdr/devicesoapysdrshared.h
+
+    HEADERS += plutosdr/deviceplutosdr.h\
+            plutosdr/deviceplutosdrbox.h\
+            plutosdr/deviceplutosdrparams.h\
+            plutosdr/deviceplutosdrscan.h\
+            plutosdr/deviceplutosdrshared.h
+
+    HEADERS += perseus/deviceperseus.h\
+            perseus/deviceperseusscan.h
+}
+
 LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
 
 MINGW32 || MINGW64 {
@@ -200,13 +248,6 @@ MINGW32 || MINGW64 {
     LIBS += -L../libiio/$${build_subdir} -llibiio
 }
 
-macx {
-    LIBS += -L/opt/local/lib -lhackrf
-    LIBS += -L/usr/local/lib -lLimeSuite
-    LIBS += -framework iio
-    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
-}
-
 MSVC {
     LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lbladeRF
@@ -214,3 +255,13 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio
 }
+
+macx {
+    LIBS += -L../libperseus -llibperseus
+    LIBS += -L/opt/local/lib -lbladeRF
+    LIBS += -L/opt/local/lib -lhackrf
+    LIBS += -L/opt/install/LimeSuite/lib/ -lLimeSuite
+    LIBS += -L/usr/local/lib -lSoapySDR
+    LIBS += -framework iio
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

libairspy/libairspy.pro

@@ -19,6 +19,7 @@ CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include"
+CONFIG(macx):INCLUDEPATH += "/opt/local/include"
 
 CONFIG(MSVC):DEFINES += _TIMESPEC_DEFINED
 
@@ -36,6 +37,11 @@ CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/opt/local/lib -lairspy
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libairspyhf/libairspyhf.pro

@@ -19,6 +19,7 @@ CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include"
+CONFIG(macx):INCLUDEPATH += "/usr/local/include"
 
 SOURCES = $$LIBAIRSPYHFSRC/src/airspyhf.c\
   $$LIBAIRSPYHFSRC/src/iqbalancer.c
@@ -31,6 +32,11 @@ CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/usr/local/lib -lairspyhf
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libbladerf/libbladerf.pro

@@ -30,6 +30,7 @@ INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include/windows
 
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.19\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.19\include\libusb-1.0"
+CONFIG(macx):INCLUDEPATH += "/opt/local/include"
 
 SOURCES = $$LIBBLADERFCOMMONSRC/src/sha256.c\
     $$LIBBLADERFCOMMONSRC/src/dc_calibration.c\
@@ -156,6 +157,11 @@ HEADERS = $$PWD/mingw/common/include/host_config.h\
 
 CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/opt/local/lib -lbladerf
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libhackrf/libhackrf.pro

@@ -19,6 +19,7 @@ CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include"
+CONFIG(macx):INCLUDEPATH += "/opt/local/include"
 
 SOURCES = $$LIBHACKRFSRC/src/hackrf.c
 
@@ -28,6 +29,11 @@ CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/opt/local/lib -lhackrf
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

liblimesuite/liblimesuite.pro

@@ -17,10 +17,16 @@ QMAKE_CXXFLAGS += -std=c++11
 
 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
 CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-18.10.0"
 
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 
+macx {
+    INCLUDEPATH += "/opt/local/include"
+    INCLUDEPATH += "/opt/local/include/libusb-1.0"
+}
+
 #CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src"
 #CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src"
 
@@ -91,7 +97,12 @@ HEADERS = $$LIBLIMESUITESRC/src/API/*.h\
     
 CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
-
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/opt/install/LimeSuite/lib/ -lLimeSuite
+    LIBS += -L/opt/local/lib -lusb-1.0
+}
 #CONFIG(MINGW32):LIBS += -L../libsqlite3/release -llibsqlite3
 #CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3
 

libmirisdr/libmirisdr.pro

@@ -0,0 +1,19 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core
+
+TEMPLATE = lib
+TARGET = libmirisdr
+
+macx {
+    INCLUDEPATH += "/opt/local/include"
+    INCLUDEPATH += "/usr/local/include"
+    SOURCES = 
+    HEADERS =
+    LIBS += -L/usr/local/lib -lmirisdr
+    LIBS += -L/opt/local/lib -lusb-1.0
+}   

libperseus/libperseus.pro

@@ -13,10 +13,12 @@ DEFINES += HAVE_CONFIG_H=1
 
 CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
 CONFIG(MINGW64):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
+CONFIG(macx):LIBPERSEUSSRC = "../../../libperseus-sdr"
 INCLUDEPATH += $$LIBPERSEUSSRC/src
 
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
+CONFIG(macx):INCLUDEPATH += /opt/local/include
 
 SOURCES = fpga_data.c\
   $$LIBPERSEUSSRC/fifo.c\
@@ -36,6 +38,12 @@ HEADERS = fpga_data.h\
 
 CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
+macx {
+    HEADERS -= config.windows.h
+    DEFINES += HAVE_LIBUSB_STRERROR
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+    LIBS += -L/opt/local/lib -lusb-1.0
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

librtlsdr/librtlsdr.pro

@@ -16,7 +16,7 @@ CONFIG(MSVC):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0"
-macx:INCLUDEPATH += /opt/local/include
+CONFIG(macx):INCLUDEPATH += /opt/local/include
 
 SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\
     $$LIBRTLSDRSRC/src/tuner_e4k.c\
@@ -42,6 +42,11 @@ HEADERS = $$LIBRTLSDRSRC/include/reg_field.h\
 CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0
 CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0
+macx {
+    SOURCES =
+    HEADERS =
+    LIBS += -L/opt/local/lib -lrtlsdr
+}
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libsoapysdr/libsoapysdr.pro

@@ -0,0 +1,19 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core
+
+TEMPLATE = lib
+TARGET = libsoapysdr
+
+macx {
+    INCLUDEPATH += "/usr/local/include"
+    INCLUDEPATH += "/opt/local/include"
+    SOURCES = 
+    HEADERS =
+    LIBS += -L/usr/local/lib -lSoapySDR
+    LIBS += -L/opt/local/lib -lusb-1.0
+}   

plugins/channelrx/daemonsink/daemonsink.pro

@@ -0,0 +1,67 @@
+#--------------------------------------------------------
+#
+# Pro file for Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia network opengl
+
+TARGET = daemonsink
+
+CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(MSVC):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc"
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+macx:INCLUDEPATH += /opt/local/include
+INCLUDEPATH += $$LIBCM256CCSRC
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSSE3=1
+QMAKE_CXXFLAGS += -mssse3
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
+
+SOURCES += daemonsink.cpp\
+    daemonsinkgui.cpp\
+    daemonsinksettings.cpp\
+    daemonsinkplugin.cpp\
+    daemonsinkthread.cpp
+
+HEADERS += daemonsink.h\
+    daemonsinkgui.h\
+    daemonsinksettings.h\
+    daemonsinkplugin.h\
+    daemonsinkthread.h
+
+FORMS += daemonsinkgui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc
+
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
+RESOURCES = ../../../sdrgui/resources/res.qrc
+
+CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1
+

plugins/channeltx/daemonsource/daemonsource.pro

@@ -0,0 +1,68 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia network opengl
+
+TARGET = daemonsource
+
+CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(MSVC):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc"
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+macx:INCLUDEPATH += /opt/local/include
+INCLUDEPATH += $$LIBCM256CCSRC
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSSE3=1
+QMAKE_CXXFLAGS += -mssse3
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
+
+SOURCES += daemonsource.cpp\
+    daemonsourcegui.cpp\
+    daemonsourcesettings.cpp\
+    daemonsourceplugin.cpp\
+    daemonsourcethread.cpp
+
+HEADERS += daemonsource.h\
+    daemonsourcegui.h\
+    daemonsourcesettings.h\
+    daemonsourceplugin.h\
+    daemonsourcethread.h
+
+FORMS += daemonsourcegui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc
+
+macx {
+    LIBS -= -L../../../nanomsg/$${build_subdir} -lnanomsg
+    LIBS += -L/usr/local/lib -lnanomsg
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
+RESOURCES = ../../../sdrgui/resources/res.qrc
+
+CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1

plugins/samplesink/bladerf1output/bladerf1output.pro

@@ -33,6 +33,7 @@ MINGW32 {
 MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
+macx:INCLUDEPATH += "/opt/local/include"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -64,4 +65,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\lib" -L"C:\Program Files\PothosSDR\bin" -lbladeRF
 }
 
+macx {
+    LIBS += -L/opt/local/lib -lbladerf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/bladerf2output/bladerf2output.pro

@@ -32,6 +32,7 @@ MINGW32 {
 MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
+macx:INCLUDEPATH += "/opt/local/include"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -63,4 +64,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\lib" -L"C:\Program Files\PothosSDR\bin" -lbladeRF
 }
 
+macx {
+    LIBS += -L/opt/local/lib -lbladerf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/hackrfoutput/hackrfoutput.pro

@@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
 
 CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
 CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
+CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -26,11 +27,7 @@ INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += ../../../devices
-!macx:INCLUDEPATH += $$LIBHACKRFSRC
+INCLUDEPATH += $$LIBHACKRFSRC
-macx:INCLUDEPATH += /opt/local/include
-macx {
-    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
-}
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -52,8 +49,12 @@ FORMS += hackrfoutputgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
-!macx:LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
+LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
-macx:LIBS += -L/opt/local/lib -lhackrf
 LIBS += -L../../../devices/$${build_subdir} -ldevices
+macx {
+    LIBS -= -L../../../libhackrf/$${build_subdir} -llibhackrf
+    LIBS += -L/opt/local/lib -lhackrf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/limesdroutput/limesdroutput.pro

@@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
 
 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(macx):LIBLIMESUITESRC = "../../../../../LimeSuite-18.10.0"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -66,11 +67,15 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../devices/$${build_subdir} -ldevices
 
-MINGW32 || macx {
+MINGW32 {
     LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
 }
 MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lLimeSuite
 }
+macx {
+    LIBS += -L/opt/install/LimeSuite/lib/ -lLimeSuite
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/plutosdroutput/plutosdroutput.pro

@@ -16,6 +16,7 @@ QMAKE_CXXFLAGS += -msse2
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
+macx:QMAKE_LFLAGS += -F/Library/Frameworks
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -34,6 +35,10 @@ MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
 
+macx {
+    INCLUDEPATH += "/Library/Frameworks/iio.framework/Headers/"
+}
+
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
@@ -64,4 +69,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio
 }
 
+macx {
+    LIBS += -framework iio
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/soapysdroutput/soapysdroutput.pro

@@ -11,13 +11,18 @@ QT += core gui multimedia opengl
 
 TARGET = outputsoapysdr
 
+CONFIG(MSVC):LIBSOAPYSDRSRC = "C:\Program Files\PothosSDR"
+CONFIG(macx):LIBSOAPYSDRSRC = "../../../../../SoapySDR"
+
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../devices
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
-INCLUDEPATH += "C:\Program Files\PothosSDR\include"
+INCLUDEPATH +=
+
+INCLUDEPATH += $$LIBSOAPYSDRSRC/include
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -40,4 +45,11 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../devices/$${build_subdir} -ldevices
-LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR
+MSVC {
+    LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR
+}
+
+macx {
+    LIBS += -L/usr/local/lib -lSoapySDR
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

plugins/samplesource/airspy/airspy.pro

@@ -13,6 +13,7 @@ TARGET = inputairspy
 
 CONFIG(MINGW32):LIBAIRSPYSRC = "C:\softs\libairspy"
 CONFIG(MSVC):LIBAIRSPYSRC = "C:\softs\libairspy"
+CONFIG(macx):INCLUDEPATH += /opt/local/include
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -49,5 +50,10 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../libairspy/$${build_subdir} -llibairspy
+macx {
+    LIBS -= -L../../../libairspy/$${build_subdir} -llibairspy
+    LIBS += -L/opt/local/lib -lairspy
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/airspyhf/airspyhf.pro

@@ -20,6 +20,7 @@ INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += $$LIBAIRSPYHFSRC
+CONFIG(macx):INCLUDEPATH += "/usr/local/include"
 
 DEFINES += USE_SSE2=1
 QMAKE_CXXFLAGS += -msse2
@@ -48,5 +49,10 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../libairspyhf/$${build_subdir} -llibairspyhf
+macx {
+    LIBS -= -L../../../libairspyhf/$${build_subdir} -llibairspyhf
+    LIBS += -L/usr/local/lib -lairspyhf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/bladerf1input/bladerf1input.pro

@@ -32,6 +32,7 @@ MINGW32 {
 MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
+macx:INCLUDEPATH += "/opt/local/include"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -63,4 +64,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\lib" -L"C:\Program Files\PothosSDR\bin" -lbladeRF
 }
 
+macx {
+    LIBS += -L/opt/local/lib -lbladerf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/bladerf2input/bladerf2input.pro

@@ -32,6 +32,7 @@ MINGW32 {
 MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
+macx:INCLUDEPATH += "/opt/local/include"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -63,4 +64,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\lib" -L"C:\Program Files\PothosSDR\bin" -lbladeRF
 }
 
+macx {
+    LIBS += -L/opt/local/lib -lbladerf
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/fcdpro/fcdpro.pro

@@ -0,0 +1,49 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia opengl
+
+TARGET = inputfcdpro
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+INCLUDEPATH += ../../../fcdhid
+INCLUDEPATH += ../../../fcdlib
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES = fcdprogui.cpp\
+    fcdproinput.cpp\
+    fcdproplugin.cpp\
+    fcdprosettings.cpp\
+    fcdprothread.cpp
+
+HEADERS = fcdprogui.h\
+    fcdproinput.h\
+    fcdproplugin.h\
+    fcdprosettings.h\
+    fcdprothread.h
+
+FORMS += fcdprogui.ui
+
+LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib
+LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger

plugins/samplesource/fcdproplus/fcdproplus.pro

@@ -7,7 +7,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 
-QT += core gui widgets multimedia network
+QT += core gui widgets multimedia opengl
 
 TARGET = inputfcdproplus
 
@@ -15,10 +15,13 @@ DEFINES += USE_SSE2=1
 QMAKE_CXXFLAGS += -msse2
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
+macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += ../../../fcdhid
 INCLUDEPATH += ../../../fcdlib
 
@@ -26,16 +29,16 @@ CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
 SOURCES = fcdproplusgui.cpp\
-	fcdproplusinputqt.cpp\
+    fcdproplusinput.cpp\
-	fcdproplusplugin.cpp\
+    fcdproplusplugin.cpp\
-	fcdproplussettings.cpp\
+    fcdproplussettings.cpp\
-	fcdproplusreader.cpp
+    fcdproplusthread.cpp
 
 HEADERS = fcdproplusgui.h\
-	fcdproplusinputqt.h\
+    fcdproplusinput.h\
-	fcdproplusplugin.h\
+    fcdproplusplugin.h\
-	fcdproplussettings.h\
+    fcdproplussettings.h\
-	fcdproplusreader.h
+    fcdproplusthread.h
 
 FORMS += fcdproplusgui.ui
 
@@ -43,3 +46,4 @@ LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib
 LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger

plugins/samplesource/hackrfinput/hackrfinput.pro

@@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
 
 CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
 CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
+CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -26,8 +27,7 @@ INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += ../../../devices
-!macx:INCLUDEPATH += $$LIBHACKRFSRC
+INCLUDEPATH += $$LIBHACKRFSRC
-macx:INCLUDEPATH += /opt/local/include
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -49,11 +49,11 @@ FORMS += hackrfinputgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
-!macx:LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
+LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
-macx:LIBS += -L/opt/local/lib -lhackrf
 LIBS += -L../../../devices/$${build_subdir} -ldevices
-
 macx {
+    LIBS -= -L../../../libhackrf/$${build_subdir} -llibhackrf
+    LIBS += -L/opt/local/lib -lhackrf
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 }
 

plugins/samplesource/limesdrinput/limesdrinput.pro

@@ -20,6 +20,7 @@ QMAKE_CXXFLAGS += -std=c++11
 CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11
 
 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(macx):LIBLIMESUITESRC = "../../../../../LimeSuite-18.10.0"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -67,11 +68,15 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../devices/$${build_subdir} -ldevices
-MINGW32 || macx {
+MINGW32 {
     LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
 }
 MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lLimeSuite
 }
+macx {
+    LIBS += -L/opt/install/LimeSuite/lib/ -lLimeSuite
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/perseus/perseus.pro

@@ -0,0 +1,61 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia opengl
+
+TARGET = perseus
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG(macx):LIBPERSEUSSRC = "../../../../../libperseus-sdr"
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+INCLUDEPATH += ../../../devices
+INCLUDEPATH += $$LIBPERSEUSSRC
+macx {
+    INCLUDEPATH += /opt/local/include
+    INCLUDEPATH += /usr/local/include
+}
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES += perseusgui.cpp\
+    perseusinput.cpp\
+    perseusplugin.cpp\
+    perseussettings.cpp\
+    perseusthread.cpp
+
+HEADERS += perseusgui.h\
+    perseusinput.h\
+    perseusplugin.h\
+    perseussettings.h\
+    perseusthread.h
+
+FORMS += perseusgui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+LIBS += -L../../../devices/$${build_subdir} -ldevices
+macx {
+#    LIBS += -L/usr/local/lib -lperseus-sdr
+    LIBS += -L../../../libperseus -llibperseus
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
+RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/plutosdrinput/plutosdrinput.pro

@@ -16,6 +16,7 @@ QMAKE_CXXFLAGS += -msse2
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
+macx:QMAKE_LFLAGS += -F/Library/Frameworks
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -34,20 +35,24 @@ MSVC {
     INCLUDEPATH += "C:\Program Files\PothosSDR\include"
 }
 
+macx {
+    INCLUDEPATH += "/Library/Frameworks/iio.framework/Headers/"
+}
+
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
 SOURCES += plutosdrinputgui.cpp\
-  plutosdrinput.cpp\
+    plutosdrinput.cpp\
-  plutosdrinputplugin.cpp\
+    plutosdrinputplugin.cpp\
-  plutosdrinputsettings.cpp\
+    plutosdrinputsettings.cpp\
-  plutosdrinputthread.cpp
+    plutosdrinputthread.cpp
 
 HEADERS += plutosdrinputgui.h\
-  plutosdrinput.h\
+    plutosdrinput.h\
-  plutosdrinputplugin.h\
+    plutosdrinputplugin.h\
-  plutosdrinputsettings.h\
+    plutosdrinputsettings.h\
-  plutosdrinputthread.h
+    plutosdrinputthread.h
 
 FORMS += plutosdrinputgui.ui
 
@@ -64,4 +69,9 @@ MSVC {
     LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio
 }
 
+macx {
+    LIBS += -framework iio
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/rtlsdr/rtlsdr.pro

@@ -49,10 +49,10 @@ FORMS += rtlsdrgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
-!macx:LIBS += -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
+LIBS -= -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
-macx:LIBS += -L/opt/local/lib -lrtlsdr
-
 macx {
+    LIBS -= -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
+    LIBS += -L/opt/local/lib -lrtlsdr
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 }
 

plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro

@@ -36,33 +36,32 @@ CONFIG(Debug):build_subdir = debug
 
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 SOURCES += sdrdaemonsourcebuffer.cpp\
-sdrdaemonsourcegui.cpp\
+    sdrdaemonsourcegui.cpp\
-sdrdaemonsourceinput.cpp\
+    sdrdaemonsourceinput.cpp\
-sdrdaemonsourcesettings.cpp\
+    sdrdaemonsourcesettings.cpp\
-sdrdaemonsourceplugin.cpp\
+    sdrdaemonsourceplugin.cpp\
-sdrdaemonsourceudphandler.cpp
+    sdrdaemonsourceudphandler.cpp
 
 HEADERS += sdrdaemonsourcebuffer.h\
-sdrdaemonsourcegui.h\
+    sdrdaemonsourcegui.h\
-sdrdaemonsourceinput.h\
+    sdrdaemonsourceinput.h\
-sdrdaemonsourcesettings.h\
+    sdrdaemonsourcesettings.h\
-sdrdaemonsourceplugin.h\
+    sdrdaemonsourceplugin.h\
-sdrdaemonsourceudphandler.h
+    sdrdaemonsourceudphandler.h
 
 FORMS += sdrdaemonsourcegui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
-
-!macx:LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
-macx:LIBS += -L/usr/local/lib -lnanomsg
 LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc
 
 macx {
+    LIBS -= -L../../../nanomsg/$${build_subdir} -lnanomsg
+    LIBS += -L/usr/local/lib -lnanomsg
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 }
 

plugins/samplesource/sdrplay/sdrplay.pro

@@ -0,0 +1,52 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia network opengl
+
+TARGET = sdrplay
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+macx:INCLUDEPATH += /usr/local/include
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSSE3=1
+QMAKE_CXXFLAGS += -mssse3
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+
+SOURCES += sdrplaygui.cpp\
+    sdrplayinput.cpp\
+    sdrplaysettings.cpp\
+    sdrplayplugin.cpp\
+    sdrplaythread.cpp
+
+HEADERS += sdrplaygui.h\
+    sdrplayinput.h\
+    sdrplaysettings.h\
+    sdrplayplugin.h\
+    sdrplaythread.h
+
+FORMS += sdrplaygui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+
+macx {
+    LIBS += -L/usr/local/lib -lmirisdr
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
+RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/soapysdrinput/soapysdrinput.pro

@@ -11,13 +11,16 @@ QT += core gui multimedia opengl
 
 TARGET = inputsoapysdr
 
+CONFIG(macx):LIBSOAPYSDRSRC = "../../../../../SoapySDR"
+
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../devices
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
-INCLUDEPATH += "C:\Program Files\PothosSDR\include"
+
+INCLUDEPATH += $$LIBSOAPYSDRSRC/include
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -40,4 +43,7 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../devices/$${build_subdir} -ldevices
-LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR
+macx {
+    LIBS += -L/usr/local/lib -lSoapySDR
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

plugins/samplesource/testsource/testsource.pro

@@ -16,6 +16,7 @@ QMAKE_CXXFLAGS += -msse2
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
+macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports

sdrangel.macos.pro

@@ -9,35 +9,68 @@ SUBDIRS = qrtplib
 SUBDIRS += httpserver
 SUBDIRS += swagger
 SUBDIRS += logging
+
 SUBDIRS += sdrbase
 SUBDIRS += sdrgui
-SUBDIRS += devices
+
 SUBDIRS += fcdhid
 SUBDIRS += fcdlib
 SUBDIRS += mbelib
 SUBDIRS += dsdcc
 SUBDIRS += cm256cc
-#SUBDIRS += liblimesuite
+
-#SUBDIRS += librtlsdr
+SUBDIRS += libairspy
+SUBDIRS += libairspyhf
+SUBDIRS += libbladerf
+SUBDIRS += libhackrf
+SUBDIRS += liblimesuite
+#SUBDIRS += libmirisdr
+SUBDIRS += libperseus
+SUBDIRS += librtlsdr
+SUBDIRS += libsoapysdr
+
+SUBDIRS += devices
+
+SUBDIRS += plugins/samplesource/airspy
+SUBDIRS += plugins/samplesource/airspyhf
+SUBDIRS += plugins/samplesource/bladerf1input
+SUBDIRS += plugins/samplesource/bladerf2input
+SUBDIRS += plugins/samplesource/fcdpro
+SUBDIRS += plugins/samplesource/fcdproplus
 SUBDIRS += plugins/samplesource/filesource
-SUBDIRS += plugins/samplesource/sdrdaemonsource
 SUBDIRS += plugins/samplesource/hackrfinput
+SUBDIRS += plugins/samplesource/limesdrinput
+SUBDIRS += plugins/samplesource/perseus
+SUBDIRS += plugins/samplesource/plutosdrinput
 SUBDIRS += plugins/samplesource/rtlsdr
+SUBDIRS += plugins/samplesource/sdrdaemonsource
+SUBDIRS += plugins/samplesource/sdrplay
+SUBDIRS += plugins/samplesource/soapysdrinput
+SUBDIRS += plugins/samplesource/testsource
+
+SUBDIRS += plugins/samplesink/bladerf1output
+SUBDIRS += plugins/samplesink/bladerf2output
 SUBDIRS += plugins/samplesink/filesink
-SUBDIRS += plugins/samplesink/sdrdaemonsink
 SUBDIRS += plugins/samplesink/hackrfoutput
+SUBDIRS += plugins/samplesink/limesdroutput
+SUBDIRS += plugins/samplesink/plutosdroutput
+SUBDIRS += plugins/samplesink/sdrdaemonsink
+SUBDIRS += plugins/samplesink/soapysdroutput
+
 SUBDIRS += plugins/channelrx/chanalyzer
-#SUBDIRS += plugins/channelrx/daemonsink
+SUBDIRS += plugins/channelrx/daemonsink
 SUBDIRS += plugins/channelrx/demodam
-SUBDIRS += plugins/channelrx/demodatv
+#SUBDIRS += plugins/channelrx/demodatv
 SUBDIRS += plugins/channelrx/demodbfm
+SUBDIRS += plugins/channelrx/demodatv
 SUBDIRS += plugins/channelrx/demoddsd
 SUBDIRS += plugins/channelrx/demodlora
 SUBDIRS += plugins/channelrx/demodnfm
 SUBDIRS += plugins/channelrx/demodssb
 SUBDIRS += plugins/channelrx/demodwfm
 SUBDIRS += plugins/channelrx/udpsink
-#SUBDIRS += plugins/channeltx/daemonsource
+
+SUBDIRS += plugins/channeltx/daemonsource
 SUBDIRS += plugins/channeltx/modam
 SUBDIRS += plugins/channeltx/modatv
 SUBDIRS += plugins/channeltx/modnfm