VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-05 16:31:15 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #265 from sigysmund/osx

Browse Source 
Osx
This commit is contained in:
f4exb 2018-12-27 22:13:49 +01:00 committed by GitHub
commit 367c8a671e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 212 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ReadmeMacOS.md
View File

@ -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:
+ build-sdrangel.macos-Desktop_Qt_5_6_2_clang_64bit-Release
SDRangel-4.x:
+ 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

74
apple/deploy.sh
View File

@ -1,38 +1,54 @@
#!/bin/bash
# Run from build directory
test -d "app/sdrangel.app/Contents" || { echo "Please build first or chdir to proper folder!"; exit 1; }
# Run from build directory after build
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}/channelrx"
mkdir -p "${APP_PLUGINS}/samplesink"
mkdir -p "${APP_PLUGINS}/samplesource"
mkdir -p $APP_PLUGINS
cp -v fcdhid/libfcdhid.dylib $APP_LIB
cp -v fcdlib/libfcdlib.dylib $APP_LIB
cp -v mbelib/libmbelib.dylib $APP_LIB
cp -v sdrbase/libsdrbase.dylib $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
dply_lib()
{
cp -f $1 $APP_LIB
echo "DeployLIB: `basename $1` to ${APP_LIB}"
}
for f in `find plugins/channelrx/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/channelrx/"; done
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
for f in `find plugins/samplesource/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/samplesource/"; done
dply_plugin()
{
tmp=`dirname $1`
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
ln -s libdevices.dylib libdevices.1.dylib
ln -s libsdrbase.dylib libsdrbase.1.dylib
ln -s libsdrgui.dylib libsdrgui.1.dylib
ln -s libmbelib.dylib libmbelib.1.dylib
ln -s liblogging.dylib liblogging.1.dylib
ln -s libhttpserver.dylib libhttpserver.1.dylib
ln -s libswagger.dylib libswagger.1.dylib
for i in `find . -name '*.1.0.0.dylib' -type f -not -path "./plugins/*"`; do
ln -sf $i "${i/.1.0.0.dylib/.1.0.dylib}"
ln -sf $i "${i/.1.0.0.dylib/.1.dylib}"
ln -sf $i "${i/.1.0.0.dylib/.dylib}"
done
cd ../../..
pwd
# Deploy DMG
/Applications/Qt/5.12.0/clang_64/bin/macdeployqt ./sdrangel.app \
-always-overwrite \
-dmg \
-libpath=sdrangel.app/Contents/Frameworks \
-verbose=1

6
apple/run.sh
View File

@ -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

4
cm256cc/cm256cc.pro
View File

@ -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

1
devices/devices.pro
View File

@ -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 {

4
dsdcc/dsdcc.pro
View File

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

4
fcdhid/fcdhid.pro
View File

@ -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/
}

4
fcdlib/fcdlib.pro
View File

@ -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/
}

3
httpserver/httpserver.pro
View File

@ -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

3
librtlsdr/librtlsdr.pro
View File

@ -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\

4
logging/logging.pro
View File

@ -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

4
mbelib/mbelib.pro
View File

@ -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\

6
plugins/channelrx/chanalyzer/chanalyzer.pro
View File

@ -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

4
plugins/channelrx/demodam/demodam.pro
View File

@ -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

6
plugins/channelrx/demodatv/demodatv.pro
View File

@ -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

6
plugins/channelrx/demodbfm/demodbfm.pro
View File

@ -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

2
plugins/channelrx/demoddatv/demoddatv.pro
View File

@ -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\

6
plugins/channelrx/demoddsd/demoddsd.pro
View File

@ -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

4
plugins/channelrx/demodlora/demodlora.pro
View File

@ -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

4
plugins/channelrx/demodnfm/demodnfm.pro
View File

@ -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

4
plugins/channelrx/demodssb/demodssb.pro
View File

@ -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

4
plugins/channelrx/demodwfm/demodwfm.pro
View File

@ -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

4
plugins/channelrx/udpsink/udpsink.pro
View File

@ -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

4
plugins/channeltx/modam/modam.pro
View File

@ -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

6
plugins/channeltx/modatv/modatv.pro
View File

@ -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

4
plugins/channeltx/modnfm/modnfm.pro
View File

@ -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

4
plugins/channeltx/modssb/modssb.pro
View File

@ -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

4
plugins/channeltx/modwfm/modwfm.pro
View File

@ -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

4
plugins/channeltx/udpsource/udpsource.pro
View File

@ -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

4
plugins/samplesink/filesink/filesink.pro
View File

@ -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

3
plugins/samplesink/hackrfoutput/hackrfoutput.pro
View File

@ -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

6
plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
View File

@ -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

4
plugins/samplesource/filesource/filesource.pro
View File

@ -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

4
plugins/samplesource/hackrfinput/hackrfinput.pro
View File

@ -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

4
plugins/samplesource/rtlsdr/rtlsdr.pro
View File

@ -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

9
plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
View File

@ -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\
@ -59,8 +59,15 @@ 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 {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
}
RESOURCES = ../../../sdrgui/resources/res.qrc
CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1

3
qrtplib/qrtplib.pro
View File

@ -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

14
sdrangel.macos.pro
View File

@ -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/udpsrc
SUBDIRS += plugins/channelrx/udpsink
#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

4
sdrbase/plugin/pluginmanager.cpp
View File

@ -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);

6
sdrbase/sdrbase.pro
View File

@ -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

6
sdrgui/sdrgui.pro
View File

@ -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

4
swagger/swagger.pro
View File

@ -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