mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Windows: MSVC2017: include LimeSDR plugins

pull/263/head
f4exb 2018-11-14 18:02:45 +01:00
rodzic 19dff97a1c
commit ee95e1d617
7 zmienionych plików z 151 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
devices/devices.pro
Wyświetl plik

@ -61,7 +61,7 @@ MINGW32 || MINGW64 || macx {
}
MSVC {
INCLUDEPATH += "C:\softs\PothosSDR\include"
INCLUDEPATH += "C:\Programs\PothosSDR\include"
}
INCLUDEPATH += $$LIBPERSEUSSRC
@ -144,6 +144,11 @@ MSVC {
limesdr/devicelimesdrparam.cpp\
limesdr/devicelimesdrshared.cpp
SOURCES += soapysdr/devicesoapysdr.cpp\
soapysdr/devicesoapysdrparams.cpp\
soapysdr/devicesoapysdrscan.cpp\
soapysdr/devicesoapysdrshared.cpp
HEADERS += hackrf/devicehackrf.h\
hackrf/devicehackrfparam.h\
hackrf/devicehackrfvalues.h\
@ -152,6 +157,11 @@ MSVC {
HEADERS += limesdr/devicelimesdr.h\
limesdr/devicelimesdrparam.h\
limesdr/devicelimesdrshared.h
HEADERS += soapysdr/devicesoapysdr.h\
soapysdr/devicesoapysdrparams.h\
soapysdr/devicesoapysdrscan.h\
soapysdr/devicesoapysdrshared.h
}
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
@ -171,5 +181,6 @@ macx {
MSVC {
LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
LIBS += -LC:\softs\PothosSDR\lib -lLimeSuite
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lLimeSuite
LIBS += -LC:\Programs\PothosSDR\bin -lSoapySDR
}

8
devices/limesdr/devicelimesdrshared.h
Wyświetl plik

@ -28,7 +28,7 @@
class DEVICES_API DeviceLimeSDRShared
{
public:
class MsgReportBuddyChange : public Message {
class DEVICES_API MsgReportBuddyChange : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -69,7 +69,7 @@ public:
{ }
};
class MsgReportClockSourceChange : public Message {
class DEVICES_API MsgReportClockSourceChange : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -98,7 +98,7 @@ public:
{ }
};
class MsgReportDeviceInfo : public Message {
class DEVICES_API MsgReportDeviceInfo : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -118,7 +118,7 @@ public:
{ }
};
class ThreadInterface
class DEVICES_API ThreadInterface
{
public:
virtual void startWork() = 0;

2
plugins/samplesink/limesdroutput/limesdroutput.cpp
Wyświetl plik

@ -772,7 +772,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
if ((m_settings.m_devSampleRate != settings.m_devSampleRate)
|| (m_settings.m_log2SoftInterp != settings.m_log2SoftInterp) || force)
{
int fifoSize = std::max(
int fifoSize = (std::max)(
(int) ((settings.m_devSampleRate/(1<<settings.m_log2SoftInterp)) * DeviceLimeSDRShared::m_sampleFifoLengthInSeconds),
DeviceLimeSDRShared::m_sampleFifoMinSize);
qDebug("LimeSDROutput::applySettings: resize FIFO: %d", fifoSize);

37
plugins/samplesink/limesdroutput/limesdroutput.pro
Wyświetl plik

@ -26,17 +26,24 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
MINGW32 || MINGW64 || macx {
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
}
MSVC {
INCLUDEPATH += "C:\Programs\PothosSDR\include"
}
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -58,7 +65,13 @@ FORMS += limesdroutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
LIBS += -L../../../devices/$${build_subdir} -ldevices
MINGW32 || MINGW64 || macx {
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
}
MSVC {
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lLimeSuite
}
RESOURCES = ../../../sdrgui/resources/res.qrc

36
plugins/samplesource/limesdrinput/limesdrinput.pro
Wyświetl plik

@ -28,17 +28,24 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
MINGW32 || MINGW64 || macx {
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
}
MSVC {
INCLUDEPATH += "C:\Programs\PothosSDR\include"
}
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -60,7 +67,12 @@ FORMS += limesdrinputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
LIBS += -L../../../devices/$${build_subdir} -ldevices
MINGW32 || MINGW64 || macx {
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
}
MSVC {
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lLimeSuite
}
RESOURCES = ../../../sdrgui/resources/res.qrc

4
sdrangel.windows.pro
Wyświetl plik

@ -35,7 +35,7 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesource/bladerf1input
CONFIG(!MSVC):SUBDIRS += plugins/samplesource/bladerf2input
SUBDIRS += plugins/samplesource/filesource
SUBDIRS += plugins/samplesource/hackrfinput
CONFIG(!MSVC):SUBDIRS += plugins/samplesource/limesdrinput
SUBDIRS += plugins/samplesource/limesdrinput
CONFIG(!MSVC):SUBDIRS += plugins/samplesource/plutosdrinput
CONFIG(MSVC):SUBDIRS += plugins/samplesource/sdrdaemonsource
SUBDIRS += plugins/samplesource/rtlsdr
@ -44,7 +44,7 @@ SUBDIRS += plugins/samplesink/filesink
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf1output
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf2output
SUBDIRS += plugins/samplesink/hackrfoutput
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/limesdroutput
SUBDIRS += plugins/samplesink/limesdroutput
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/plutosdroutput
CONFIG(MSVC):SUBDIRS += plugins/samplesink/sdrdaemonsink
SUBDIRS += plugins/channelrx/chanalyzer

82
windowsms.install.bat 100644
Wyświetl plik

@ -0,0 +1,82 @@
SET libusbdir="C:\softs\libusb-1.0.22\MS64"
SET opencvdir="C:\softs\opencv\build\mw32\install\x86\mingw\bin"
SET libxml2dir="C:\softs\libxml2-2.7.8.win32"
SET libiconvdir="C:\softs\iconv-1.9.2.win32"
SET libzlib1dir="C:\softs\zlib-1.2.5"
SET pothosdir="C:\Programs\PothosSDR"
copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2
copy sdrbase\res.qrb %2\sdrbase.rcc
copy sdrgui\%1\sdrgui.dll %2
copy devices\%1\devices.dll %2
copy mbelib\%1\mbelib.dll %2
REM copy dsdcc\%1\dsdcc.dll %2
copy serialdv\%1\serialdv.dll %2
copy httpserver\%1\httpserver.dll %2
copy qrtplib\%1\qrtplib.dll %2
copy swagger\%1\swagger.dll %2
copy logging\%1\logging.dll %2
copy cm256cc\%1\cm256cc.dll %2
copy libhackrf\%1\libhackrf.dll %2
copy librtlsdr\%1\librtlsdr.dll %2
copy libairspy\%1\libairspy.dll %2
copy libairspyhf\%1\libairspyhf.dll %2
REM copy libbladerf\%1\libbladerf.dll %2
REM copy libiio\%1\libiio.dll %2
copy %pothosdir%\bin\LimeSuite.dll %2
copy %libusbdir%\dll\libusb-1.0.dll %2
REM copy libsqlite3\%1\libsqlite3.dll %2
REM copy %libxml2dir%\bin\libxml2.dll %2
REM copy %libiconvdir%\bin\iconv.dll %2
REM copy %libzlib1dir%\bin\zlib1.dll %2
REM copy %opencvdir%\opencv_ffmpeg2413.dll %2
REM copy %opencvdir%\libopencv_imgproc2413.dll %2
REM copy %opencvdir%\libopencv_highgui2413.dll %2
REM copy %opencvdir%\libopencv_core2413.dll %2
mkdir %2\plugins
mkdir %2\plugins\channelrx
mkdir %2\plugins\channeltx
mkdir %2\plugins\samplesource
mkdir %2\plugins\samplesink
copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx
copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx
copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx
copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
REM copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx
REM copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx
copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx
copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx
copy plugins\channelrx\udpsink\%1\udpsink.dll %2\plugins\channelrx
copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx
REM copy plugins\channeltx\modatv\%1\modatv.dll %2\plugins\channeltx
copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx
copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx
copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx
copy plugins\channeltx\udpsource\%1\udpsource.dll %2\plugins\channeltx
copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
copy plugins\samplesource\testsource\%1\inputtestsource.dll %2\plugins\samplesource
copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource
REM copy plugins\samplesource\bladerf1input\%1\inputbladerf1.dll %2\plugins\samplesource
REM copy plugins\samplesource\bladerf2input\%1\inputbladerf2.dll %2\plugins\samplesource
copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
REM copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource
copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource
copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink
REM copy plugins\samplesink\bladerf1output\%1\outputbladerf1.dll %2\plugins\samplesink
REM copy plugins\samplesink\bladerf2output\%1\outputbladerf2.dll %2\plugins\samplesink
copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink
copy plugins\samplesink\limesdroutput\%1\outputlimesdr.dll %2\plugins\samplesink
REM copy plugins\samplesink\plutosdroutput\%1\outputplutosdr.dll %2\plugins\samplesink
copy plugins\samplesink\sdrdaemonsink\%1\outputsdrdaemonsink.dll %2\plugins\samplesink