Update to Qt 5.12.0.

Project files with MacOS clang RPATH to use proper paths for shared objects.
Minor path updates in favor of loading plugin libs.
Deployment script packaging using Qt way(macdeployqt).

ReadmeMacOS.md

@@ -1,7 +1,7 @@
 # MacOS
 
 ## Prerequisites for OSX (Sierra):
-- Qt (used 5.6.2)
+- Qt (used 5.12)
 - XCode with MacPorts
 - HackRF One
 
@@ -9,17 +9,18 @@ We are only covering HackRF One, since is only the hardware I own.
 In the future we will test RTL based: NooElec NESDR Nano 3(RTL2832U & R820T2).
 
 ### Project dir structure:
-SDRangel-3.x:
+SDRangel-4.x:
-  + build-sdrangel.macos-Desktop_Qt_5_6_2_clang_64bit-Release
+  + build-sdrangel.macos-Desktop_Qt_5_12_0_clang_64bit-Release
   + sdrangel
   + deps
     + cm256cc
     + dsdcc
     + mbelib
-+ boost_1_64_0/
+    + nanomsg
++ boost_1_69_0/
 
 ### Environment preparation
-Boost 1.64: Download and unpack
+Boost 1.69: Download and unpack
 There are a few dependencies which can be installed through MacPorts:
 ```
 sudo port install cmake hackrf-devel bladeRF rtl-sdr opencv

apple/deploy.sh

@@ -1,38 +1,54 @@
 #!/bin/bash
 
-# Run from build directory
+# Run from build directory after build
-test -d "app/sdrangel.app/Contents" || { echo "Please build first or chdir to proper folder!"; exit 1; }
+APP_PATH="app/sdrangel.app"
+test -d "${APP_PATH}/Contents" || { echo "Please build first or chdir to proper folder!"; exit 1; }
 
-APP_LIB="app/sdrangel.app/Contents/lib"
+APP_LIB="${APP_PATH}/Contents/Frameworks"
 APP_PLUGINS="${APP_LIB}/plugins"
 
-mkdir -p "${APP_PLUGINS}/channeltx"
+mkdir -p $APP_PLUGINS
-mkdir -p "${APP_PLUGINS}/channelrx"
-mkdir -p "${APP_PLUGINS}/samplesink"
-mkdir -p "${APP_PLUGINS}/samplesource"
 
-cp -v fcdhid/libfcdhid.dylib $APP_LIB
+dply_lib()
-cp -v fcdlib/libfcdlib.dylib $APP_LIB
+{
-cp -v mbelib/libmbelib.dylib $APP_LIB
+	cp -f $1 $APP_LIB
-cp -v sdrbase/libsdrbase.dylib $APP_LIB
+	echo "DeployLIB: `basename $1` to ${APP_LIB}"
-cp -v sdrgui/libsdrgui.dylib $APP_LIB
+}
-cp -v devices/libdevices.dylib $APP_LIB
-cp -v cm256cc/libcm256cc.dylib $APP_LIB
-cp -v httpserver/libhttpserver.dylib $APP_LIB
-cp -v swagger/libswagger.dylib $APP_LIB
-cp -v logging/liblogging.dylib $APP_LIB
 
-for f in `find plugins/channelrx/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/channelrx/"; done
+dply_plugin()
-for f in `find plugins/channeltx/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/channeltx/"; done
+{
-for f in `find plugins/samplesink/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/samplesink/"; done
+	tmp=`dirname $1`
-for f in `find plugins/samplesource/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/samplesource/"; done
+	tmp=`dirname $tmp`
+	plugin_type=`basename $tmp`
+	plugin_path="${APP_PLUGINS}/${plugin_type}"
+	mkdir -p $plugin_path
+	cp -f $1 $plugin_path
+	echo "DeployPLUGIN: `basename $1` to ${plugin_path}"
+}
 
+# 1st-pass: Gather libs & plugins
+for i in `find . -name '*.dylib' -type f -not -path "./${APP_PATH}/*"`; do 
+	if [[ $i == *"plugins/"* ]]; then
+		dply_plugin $i
+	else
+		dply_lib $i
+	fi
+done
+
+# 2nd-pass: Symlink libs
 cd $APP_LIB
-ln -s libdsdcc.dylib libdsdcc.1.dylib
+for i in `find . -name '*.1.0.0.dylib' -type f -not -path "./plugins/*"`; do
-ln -s libdevices.dylib libdevices.1.dylib
+	ln -sf $i "${i/.1.0.0.dylib/.1.0.dylib}"
-ln -s libsdrbase.dylib libsdrbase.1.dylib
+	ln -sf $i "${i/.1.0.0.dylib/.1.dylib}"
-ln -s libsdrgui.dylib libsdrgui.1.dylib
+	ln -sf $i "${i/.1.0.0.dylib/.dylib}"
-ln -s libmbelib.dylib libmbelib.1.dylib
+done
-ln -s liblogging.dylib liblogging.1.dylib
+cd ../../..
-ln -s libhttpserver.dylib libhttpserver.1.dylib
+pwd
-ln -s libswagger.dylib libswagger.1.dylib
+
+# Deploy DMG
+/Applications/Qt/5.12.0/clang_64/bin/macdeployqt ./sdrangel.app \
+	-always-overwrite \
+	-dmg \
+	-libpath=sdrangel.app/Contents/Frameworks \
+	-verbose=1
+

apple/run.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-test -d app/sdrangel.app/Contents || { echo "Please build first or chdir to proper folder!"; exit 1; }
-
-cd app/sdrangel.app/Contents/lib 
-DYLD_LIBRARY_PATH=/opt/local/lib:.; ../MacOS/sdrangel

cm256cc/cm256cc.pro

@@ -22,6 +22,10 @@ INCLUDEPATH += $$LIBCM256CCSRC
 DEFINES += USE_SSSE3=1
 QMAKE_CXXFLAGS += -mssse3
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 

devices/devices.pro

@@ -204,6 +204,7 @@ macx {
     LIBS += -L/opt/local/lib -lhackrf
     LIBS += -L/usr/local/lib -lLimeSuite
     LIBS += -framework iio
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
 }
 
 MSVC {

dsdcc/dsdcc.pro

@@ -90,3 +90,7 @@ $$LIBDSDCCSRC/timeutil.h\
 $$LIBDSDCCSRC/export.h
 
 LIBS += -L../mbelib/$${build_subdir} -lmbelib
+
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

fcdhid/fcdhid.pro

@@ -29,3 +29,7 @@ HEADERS = $$PWD/fcdhid.h\
 CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -liconv
 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -liconv
 CONFIG(macx):LIBS += -L/opt/local/lib -lusb-1.0 -liconv
+
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

fcdlib/fcdlib.pro

@@ -24,3 +24,7 @@ HEADERS = $$PWD/fcdtraits.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 {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}

httpserver/httpserver.pro

@@ -13,6 +13,9 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../exports
 
 QMAKE_CXXFLAGS += -std=c++11
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug

librtlsdr/librtlsdr.pro

@@ -13,11 +13,10 @@ CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 CONFIG(MSVC):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 
-INCLUDEPATH += $$LIBRTLSDRSRC/include
-
 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
 
 SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\
     $$LIBRTLSDRSRC/src/tuner_e4k.c\

logging/logging.pro

@@ -14,6 +14,10 @@ INCLUDEPATH += ../exports
 
 QMAKE_CXXFLAGS += -std=c++11
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 CONFIG(MSVC):DEFINES += logging_EXPORTS
 
 CONFIG(Release):build_subdir = release

mbelib/mbelib.pro

@@ -16,6 +16,10 @@ CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
 CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib"
 CONFIG(macx):LIBMBELIBSRC = "../../deps/mbelib"
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 INCLUDEPATH += $$LIBMBELIBSRC
 
 SOURCES = $$LIBMBELIBSRC/ambe3600x2400.c\

plugins/channelrx/chanalyzer/chanalyzer.pro

@@ -26,7 +26,7 @@ CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -47,4 +47,8 @@ FORMS += chanalyzergui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodam/demodam.pro

@@ -45,4 +45,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodatv/demodatv.pro

@@ -28,7 +28,7 @@ CONFIG(Debug):build_subdir = debug
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 SOURCES += atvdemod.cpp\
 	atvdemodgui.cpp\
@@ -43,4 +43,8 @@ FORMS += atvdemodgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodbfm/demodbfm.pro

@@ -27,7 +27,7 @@ CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -56,4 +56,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demoddatv/demoddatv.pro

@@ -27,7 +27,7 @@ CONFIG(Debug):build_subdir = debug
 
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\ffmpeg-20181127-1035206-win64-dev\include"
-CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 SOURCES += datvdemod.cpp\
     datvdemodgui.cpp\

plugins/channelrx/demoddsd/demoddsd.pro

@@ -30,7 +30,7 @@ CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib"
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
 
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
@@ -67,4 +67,8 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 LIBS += -L../../../dsdcc/$${build_subdir} -ldsdcc
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodlora/demodlora.pro

@@ -40,4 +40,8 @@ FORMS += lorademodgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodnfm/demodnfm.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodssb/demodssb.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/demodwfm/demodwfm.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channelrx/udpsink/udpsink.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channeltx/modam/modam.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channeltx/modatv/modatv.pro

@@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
@@ -43,6 +44,11 @@ FORMS += atvmodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 CONFIG(MINGW32):LIBS += -LD:\softs\opencv\build\mw32\install\x86\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413
 CONFIG(MINGW64):LIBS += -LD:\softs\opencv\build\mw64\install\x64\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413

plugins/channeltx/modnfm/modnfm.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channeltx/modssb/modssb.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channeltx/modwfm/modwfm.pro

@@ -42,4 +42,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/channeltx/udpsource/udpsource.pro

@@ -46,4 +46,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/filesink/filesink.pro

@@ -44,4 +44,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesink/hackrfoutput/hackrfoutput.pro

@@ -29,6 +29,9 @@ INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 INCLUDEPATH += ../../../devices
 !macx: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

plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro

@@ -38,7 +38,7 @@ CONFIG(Debug):build_subdir = debug
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
 
 SOURCES += sdrdaemonsinkthread.cpp\
 sdrdaemonsinkgui.cpp\
@@ -63,6 +63,10 @@ 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/samplesource/filesource/filesource.pro

@@ -44,4 +44,8 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/hackrfinput/hackrfinput.pro

@@ -54,4 +54,8 @@ LIBS += -L../../../swagger/$${build_subdir} -lswagger
 macx:LIBS += -L/opt/local/lib -lhackrf
 LIBS += -L../../../devices/$${build_subdir} -ldevices
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/rtlsdr/rtlsdr.pro

@@ -53,4 +53,8 @@ LIBS += -L../../../swagger/$${build_subdir} -lswagger
 !macx:LIBS += -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
 macx:LIBS += -L/opt/local/lib -lrtlsdr
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = ../../../sdrgui/resources/res.qrc

plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro

@@ -38,7 +38,7 @@ CONFIG(Debug):build_subdir = debug
 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
-CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
 
 SOURCES += sdrdaemonsourcebuffer.cpp\
 sdrdaemonsourcegui.cpp\
@@ -64,6 +64,10 @@ LIBS += -L../../../swagger/$${build_subdir} -lswagger
 macx:LIBS += -L/usr/local/lib -lnanomsg
 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

qrtplib/qrtplib.pro

@@ -13,6 +13,9 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../exports
 
 QMAKE_CXXFLAGS += -std=c++11
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
 
 CONFIG(MSVC):DEFINES += qrtplib_EXPORTS
 

sdrangel.macos.pro

@@ -5,7 +5,8 @@
 #--------------------------------------------------------
 
 TEMPLATE = subdirs
-SUBDIRS  = httpserver
+SUBDIRS = qrtplib
+SUBDIRS += httpserver
 SUBDIRS += swagger
 SUBDIRS += logging
 SUBDIRS += sdrbase
@@ -20,12 +21,13 @@ SUBDIRS += cm256cc
 #SUBDIRS += librtlsdr
 SUBDIRS += plugins/samplesource/filesource
 SUBDIRS += plugins/samplesource/sdrdaemonsource
-SUBDIRS += plugins/samplesource/rtlsdr
 SUBDIRS += plugins/samplesource/hackrfinput
+SUBDIRS += plugins/samplesource/rtlsdr
 SUBDIRS += plugins/samplesink/filesink
+SUBDIRS += plugins/samplesink/sdrdaemonsink
 SUBDIRS += plugins/samplesink/hackrfoutput
 SUBDIRS += plugins/channelrx/chanalyzer
-SUBDIRS += plugins/channelrx/chanalyzerng
+#SUBDIRS += plugins/channelrx/daemonsink
 SUBDIRS += plugins/channelrx/demodam
 SUBDIRS += plugins/channelrx/demodatv
 SUBDIRS += plugins/channelrx/demodbfm
@@ -34,14 +36,14 @@ SUBDIRS += plugins/channelrx/demodlora
 SUBDIRS += plugins/channelrx/demodnfm
 SUBDIRS += plugins/channelrx/demodssb
 SUBDIRS += plugins/channelrx/demodwfm
-SUBDIRS += plugins/channelrx/tcpsrc
+SUBDIRS += plugins/channelrx/udpsink
-SUBDIRS += plugins/channelrx/udpsrc
+#SUBDIRS += plugins/channeltx/daemonsource
 SUBDIRS += plugins/channeltx/modam
 SUBDIRS += plugins/channeltx/modatv
 SUBDIRS += plugins/channeltx/modnfm
 SUBDIRS += plugins/channeltx/modssb
 SUBDIRS += plugins/channeltx/modwfm
-SUBDIRS += plugins/channeltx/udpsink
+SUBDIRS += plugins/channeltx/udpsource
 
 # Main app must be last
 CONFIG += ordered

sdrbase/plugin/pluginmanager.cpp

@@ -63,6 +63,10 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
 {
     QString applicationDirPath = QCoreApplication::instance()->applicationDirPath();
     QString applicationLibPath = applicationDirPath + "/../lib/" + pluginsSubDir;
+#ifdef __APPLE__
+    applicationLibPath.clear();
+    applicationLibPath.append(applicationDirPath + "/../Frameworks/" + pluginsSubDir);
+#endif
     QString applicationBuildPath = applicationDirPath + "/" + pluginsSubDir;
     qDebug() << "PluginManager::loadPlugins: " << qPrintable(applicationLibPath) << "," << qPrintable(applicationBuildPath);
 

sdrbase/sdrbase.pro

@@ -42,7 +42,7 @@ CONFIG(MINGW32):INCLUDEPATH += "C:\softs\serialDV"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\serialDV"
 
-CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
 
 MINGW32 || MINGW64 || MSVC {
     HEADERS += \
@@ -234,6 +234,10 @@ LIBS += -L../httpserver/$${build_subdir} -lhttpserver
 LIBS += -L../qrtplib/$${build_subdir} -lqrtplib
 LIBS += -L../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RCC_BINARY_SOURCES += resources/res.qrc
 
 asset_builder.commands = $$[QT_HOST_BINS]/rcc -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -no-compress

sdrgui/sdrgui.pro

@@ -38,7 +38,7 @@ CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
 
-CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
 
 SOURCES += mainwindow.cpp\
         device/deviceuiset.cpp\
@@ -185,6 +185,10 @@ LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../logging/$${build_subdir} -llogging
 LIBS += -L../swagger/$${build_subdir} -lswagger
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 RESOURCES = resources/res.qrc
 
 CONFIG(ANDROID):CONFIG += mobility

swagger/swagger.pro

@@ -23,6 +23,10 @@ QMAKE_CXXFLAGS += -msse4.1
 
 QMAKE_CXXFLAGS += -std=c++11
 
+macx {
+    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+}
+
 CONFIG(MSVC):DEFINES += swagger_EXPORTS
 
 CONFIG(Release):build_subdir = release