Merge branch 'master' into dev

2018-03-14 19:18:20 +01:00 · 2018-03-14 19:18:20 +01:00 · f75b45a1c1
parent c99693eacc c2d2683f70
commit f75b45a1c1
7 changed files with 50 additions and 17 deletions
--- a/ReadmeMacOS.md
+++ b/ReadmeMacOS.md
@ -6,13 +6,14 @@
 - HackRF One

 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:
-+ .
-+ build-sdrangel.macos-Desktop_Qt_5_6_2_clang_64bit-Release
-+ SDRangel/
+SDRangel-3.x:
+  + build-sdrangel.macos-Desktop_Qt_5_6_2_clang_64bit-Release
  + sdrangel
  + deps
+    + cm256cc
    + dsdcc
    + mbelib
    + nanomsg
@ -27,6 +28,13 @@ sudo port install cmake hackrf-devel bladeRF rtl-sdr opencv

 Clone other libs to deps folder:

+##### cm256cc:
+```
+git clone https://github.com/f4exb/cm256cc.git
+
+```
+
+
 ##### mbelib:
 ```
 git clone https://github.com/szechyjs/mbelib.git
--- a/app/app.pro
+++ b/app/app.pro
@ -19,6 +19,7 @@ CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug

 SOURCES += main.cpp
+
 LIBS += -L../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../logging/$${build_subdir} -llogging
--- a/apple/deploy.sh
+++ b/apple/deploy.sh
@ -15,9 +15,12 @@ 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 sdrbase/libsdrgui.dylib $APP_LIB
+cp -v sdrgui/libsdrgui.dylib $APP_LIB
 cp -v devices/libdevices.dylib $APP_LIB
-cp -v dsdcc/libdsdcc.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
 for f in `find plugins/channeltx/ -name '*.dylib'`; do cp -v $f "${APP_PLUGINS}/channeltx/"; done
@ -29,4 +32,8 @@ cp /opt/local/lib/libnanomsg.5.0.0.dylib .
 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
--- a/cm256cc/cm256cc.pro
+++ b/cm256cc/cm256cc.pro
@ -11,10 +11,11 @@ TARGET = cm256cc

 CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc"
 CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
+CONFIG(macx):LIBCM256CCSRC = "../../deps/cm256cc"

 INCLUDEPATH += $$LIBCM256CCSRC

-DEFINES += __WINDOWS__=1
+!macx:DEFINES += __WINDOWS__=1
 DEFINES += USE_SSSE3=1
 QMAKE_CXXFLAGS += -mssse3

--- a/devices/devices.pro
+++ b/devices/devices.pro
@ -16,15 +16,18 @@ QMAKE_CXXFLAGS += -mssse3
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
+macx:QMAKE_LFLAGS += -F/Library/Frameworks

 CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
 CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
 CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
 CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host"
 CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host"
+CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0"
 CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite"
 CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite"
 CONFIG(MINGW32):LIBPERSEUSSRC = "D:\softs\libperseus-sdr"
+CONFIG(macx):LIBIIOSRC = "../../../libiio"
 CONFIG(MINGW32):LIBIIOSRC = "D:\softs\libiio"
 CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio"

@ -47,7 +50,7 @@ INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
 INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
 INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
 INCLUDEPATH += $$LIBPERSEUSSRC
-INCLUDEPATH += $$LIBIIOSRC
+!macx:INCLUDEPATH += $$LIBIIOSRC

 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@ -64,7 +67,7 @@ SOURCES += limesdr/devicelimesdr.cpp\
        limesdr/devicelimesdrparam.cpp\
        limesdr/devicelimesdrshared.cpp

-SOURCES += plutosdr/deviceplutosdr.cpp\
+!macx:SOURCES += plutosdr/deviceplutosdr.cpp\
        plutosdr/deviceplutosdrbox.cpp\
        plutosdr/deviceplutosdrparams.cpp\
        plutosdr/deviceplutosdrscan.cpp\
@ -91,13 +94,16 @@ HEADERS += plutosdr/deviceplutosdr.h\
        plutosdr/deviceplutosdrshared.h

 LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
-LIBS += -L../libbladerf/$${build_subdir} -llibbladerf
-LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
-LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite
-LIBS += -L../libiio/$${build_subdir} -llibiio
-
+!macx {
+    LIBS += -L../libbladerf/$${build_subdir} -llibbladerf
+    LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
+    LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite
+    LIBS += -L../libiio/$${build_subdir} -llibiio
+}
 macx {
    LIBS -= -L../libbladerf/$${build_subdir} -llibbladerf
    LIBS -= -L../libhackrf/$${build_subdir} -llibhackrf
    LIBS += -L/opt/local/lib -lhackrf
+    LIBS += -L/usr/local/lib -lLimeSuite
+    LIBS += -framework iio
 }
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
@ -16,12 +16,14 @@ CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"

 CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc"
 CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
+CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc"

 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
-INCLUDEPATH += $$LIBNANOMSGSRC/src
+!macx:INCLUDEPATH += $$LIBNANOMSGSRC/src
+macx:INCLUDEPATH += /opt/local/include
 INCLUDEPATH += $$LIBCM256CCSRC

 DEFINES += USE_SSE2=1
@ -37,6 +39,7 @@ CONFIG(Debug):build_subdir = debug

 CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
 CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0"
+CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"

 SOURCES += sdrdaemonsourcebuffer.cpp\
 sdrdaemonsourcegui.cpp\
@ -57,7 +60,8 @@ FORMS += sdrdaemonsourcegui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
 LIBS += -L../../../swagger/$${build_subdir} -lswagger
-LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
+!macx:LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
+macx:LIBS += -L/opt/local/lib -lnanomsg
 LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc

 RESOURCES = ../../../sdrgui/resources/res.qrc
--- a/sdrangel.macos.pro
+++ b/sdrangel.macos.pro
@ -5,15 +5,21 @@
 #--------------------------------------------------------

 TEMPLATE = subdirs
-SUBDIRS = sdrbase
+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 += plugins/samplesource/filesource
-SUBDIRS += plugins/samplesource/sdrdaemon
+SUBDIRS += plugins/samplesource/sdrdaemonsource
 SUBDIRS += plugins/samplesource/rtlsdr
 SUBDIRS += plugins/samplesource/hackrfinput
 SUBDIRS += plugins/samplesink/filesink