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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
f4exb
2019-01-01 19:00:07 +01:00
parent 3374892c61 13eae0d8fe
commit 93f64eee70
35 changed files with 676 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspy.pro
+6
View File
@@ -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
+6
View File
@@ -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
+6
View File
@@ -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
+6
View File
@@ -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
+49
View File
@@ -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
+13 -9
View File
@@ -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\
fcdproplusplugin.cpp\
fcdproplussettings.cpp\
fcdproplusreader.cpp
fcdproplusinput.cpp\
fcdproplusplugin.cpp\
fcdproplussettings.cpp\
fcdproplusthread.cpp
HEADERS = fcdproplusgui.h\
fcdproplusinputqt.h\
fcdproplusplugin.h\
fcdproplussettings.h\
fcdproplusreader.h
fcdproplusinput.h\
fcdproplusplugin.h\
fcdproplussettings.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
+5 -5
View File
@@ -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
macx:INCLUDEPATH += /opt/local/include
INCLUDEPATH += $$LIBHACKRFSRC
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
macx:LIBS += -L/opt/local/lib -lhackrf
LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
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
+6 -1
View File
@@ -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
+61
View File
@@ -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
+18 -8
View File
@@ -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\
plutosdrinputplugin.cpp\
plutosdrinputsettings.cpp\
plutosdrinputthread.cpp
plutosdrinput.cpp\
plutosdrinputplugin.cpp\
plutosdrinputsettings.cpp\
plutosdrinputthread.cpp
HEADERS += plutosdrinputgui.h\
plutosdrinput.h\
plutosdrinputplugin.h\
plutosdrinputsettings.h\
plutosdrinputthread.h
plutosdrinput.h\
plutosdrinputplugin.h\
plutosdrinputsettings.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
+3 -3
View File
@@ -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
macx:LIBS += -L/opt/local/lib -lrtlsdr
LIBS -= -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
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
+13 -14
View File
@@ -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\
sdrdaemonsourceinput.cpp\
sdrdaemonsourcesettings.cpp\
sdrdaemonsourceplugin.cpp\
sdrdaemonsourceudphandler.cpp
sdrdaemonsourcegui.cpp\
sdrdaemonsourceinput.cpp\
sdrdaemonsourcesettings.cpp\
sdrdaemonsourceplugin.cpp\
sdrdaemonsourceudphandler.cpp
HEADERS += sdrdaemonsourcebuffer.h\
sdrdaemonsourcegui.h\
sdrdaemonsourceinput.h\
sdrdaemonsourcesettings.h\
sdrdaemonsourceplugin.h\
sdrdaemonsourceudphandler.h
sdrdaemonsourcegui.h\
sdrdaemonsourceinput.h\
sdrdaemonsourcesettings.h\
sdrdaemonsourceplugin.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
+52
View File
@@ -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
+8 -2
View File
@@ -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
+1
View File
@@ -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