diff --git a/devices/devices.pro b/devices/devices.pro index 4d34d5297..c06a7188e 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -156,6 +156,12 @@ MSVC { soapysdr/devicesoapysdrscan.cpp\ soapysdr/devicesoapysdrshared.cpp + SOURCES += plutosdr/deviceplutosdr.cpp\ + plutosdr/deviceplutosdrbox.cpp\ + plutosdr/deviceplutosdrparams.cpp\ + plutosdr/deviceplutosdrscan.cpp\ + plutosdr/deviceplutosdrshared.cpp + HEADERS += bladerf1/devicebladerf1.h\ bladerf1/devicebladerf1param.h\ bladerf1/devicebladerf1values.h\ @@ -177,6 +183,12 @@ MSVC { soapysdr/devicesoapysdrparams.h\ soapysdr/devicesoapysdrscan.h\ soapysdr/devicesoapysdrshared.h + + HEADERS += plutosdr/deviceplutosdr.h\ + plutosdr/deviceplutosdrbox.h\ + plutosdr/deviceplutosdrparams.h\ + plutosdr/deviceplutosdrscan.h\ + plutosdr/deviceplutosdrshared.h } LIBS += -L../sdrbase/$${build_subdir} -lsdrbase @@ -199,4 +211,5 @@ MSVC { LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lbladeRF LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lLimeSuite LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR + LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio } diff --git a/devices/plutosdr/deviceplutosdrbox.h b/devices/plutosdr/deviceplutosdrbox.h index 4941ff30b..c3487c833 100644 --- a/devices/plutosdr/deviceplutosdrbox.h +++ b/devices/plutosdr/deviceplutosdrbox.h @@ -24,6 +24,11 @@ #include "export.h" +#if defined(_MSC_VER) +#include +typedef SSIZE_T ssize_t; +#endif + class DEVICES_API DevicePlutoSDRBox { public: diff --git a/devices/plutosdr/deviceplutosdrparams.h b/devices/plutosdr/deviceplutosdrparams.h index 113b05752..4ff154cb6 100644 --- a/devices/plutosdr/deviceplutosdrparams.h +++ b/devices/plutosdr/deviceplutosdrparams.h @@ -30,7 +30,7 @@ class DEVICES_API DevicePlutoSDRBox; * There is only one copy that is constructed by the first participant and destroyed by the last. * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx). */ -class DevicePlutoSDRParams +class DEVICES_API DevicePlutoSDRParams { public: DevicePlutoSDRParams(); diff --git a/devices/plutosdr/deviceplutosdrshared.h b/devices/plutosdr/deviceplutosdrshared.h index 9d98c66a0..78657b369 100644 --- a/devices/plutosdr/deviceplutosdrshared.h +++ b/devices/plutosdr/deviceplutosdrshared.h @@ -42,7 +42,7 @@ public: virtual bool isRunning() = 0; }; - class MsgCrossReportToBuddy : public Message { + class DEVICES_API MsgCrossReportToBuddy : public Message { MESSAGE_CLASS_DECLARATION public: uint64_t getDevSampleRate() const { return m_devSampleRate; } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.pro b/plugins/samplesink/plutosdroutput/plutosdroutput.pro index 2d1fd03e4..1cee810e4 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.pro +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.pro @@ -17,17 +17,22 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" - INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -INCLUDEPATH += ../../../libiio/includemw -INCLUDEPATH += $$LIBIIOSRC + +MINGW32 || MINGW64 { + LIBIIOSRC = "C:\softs\libiio" + INCLUDEPATH += ../../../libiio/includemw + INCLUDEPATH += $$LIBIIOSRC +} + +MSVC { + INCLUDEPATH += "C:\Program Files\PothosSDR\include" +} CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug @@ -49,7 +54,14 @@ FORMS += plutosdroutputgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger -LIBS += -L../../../libiio/$${build_subdir} -llibiio LIBS += -L../../../devices/$${build_subdir} -ldevices +MINGW32 || MINGW64 { + LIBS += -L../../../libiio/$${build_subdir} -llibiio +} + +MSVC { + LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio +} + RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp index 88a10bc7a..fd51f6b07 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp @@ -14,8 +14,6 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include - #include "plutosdr/deviceplutosdrbox.h" #include "plutosdroutputsettings.h" #include "iio.h" diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.pro b/plugins/samplesource/plutosdrinput/plutosdrinput.pro index f18fe1bb4..74999834f 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.pro +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.pro @@ -17,17 +17,22 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" - INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -INCLUDEPATH += ../../../libiio/includemw -INCLUDEPATH += $$LIBIIOSRC + +MINGW32 || MINGW64 { + LIBIIOSRC = "C:\softs\libiio" + INCLUDEPATH += ../../../libiio/includemw + INCLUDEPATH += $$LIBIIOSRC +} + +MSVC { + INCLUDEPATH += "C:\Program Files\PothosSDR\include" +} CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug @@ -49,7 +54,14 @@ FORMS += plutosdrinputgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger -LIBS += -L../../../libiio/$${build_subdir} -llibiio LIBS += -L../../../devices/$${build_subdir} -ldevices +MINGW32 || MINGW64 { + LIBS += -L../../../libiio/$${build_subdir} -llibiio +} + +MSVC { + LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -llibiio +} + RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp index a85a078a3..5c0f90c28 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp @@ -14,8 +14,6 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include - #include "plutosdr/deviceplutosdrbox.h" #include "plutosdrinputsettings.h" #include "plutosdrinputthread.h" diff --git a/windowsms.install.bat b/windowsms.install.bat index 6453a7233..ea21ba9a5 100644 --- a/windowsms.install.bat +++ b/windowsms.install.bat @@ -27,7 +27,7 @@ copy librtlsdr\%1\librtlsdr.dll %2 copy libairspy\%1\libairspy.dll %2 copy libairspyhf\%1\libairspyhf.dll %2 copy %pothosdir%\bin\bladeRF.dll %2 -REM copy libiio\%1\libiio.dll %2 +copy %pothosdir%\bin\libiio.dll %2 copy %pothosdir%\bin\LimeSuite.dll %2 copy %pothosdir%\bin\SoapySDR.dll %2 @@ -78,7 +78,7 @@ copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource copy plugins\samplesource\bladerf1input\%1\inputbladerf1.dll %2\plugins\samplesource 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\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource copy plugins\samplesource\soapysdrinput\%1\inputsoapysdr.dll %2\plugins\samplesource @@ -87,6 +87,6 @@ copy plugins\samplesink\bladerf1output\%1\outputbladerf1.dll %2\plugins\samplesi 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\plutosdroutput\%1\outputplutosdr.dll %2\plugins\samplesink copy plugins\samplesink\sdrdaemonsink\%1\outputsdrdaemonsink.dll %2\plugins\samplesink copy plugins\samplesink\soapysdroutput\%1\outputsoapysdr.dll %2\plugins\samplesink