LimeSDR output: fixed build and compile

This commit is contained in:
f4exb 2017-09-19 22:11:55 +02:00
parent 03fba87e46
commit dc0d9d9e0a
5 changed files with 8 additions and 10 deletions

View File

@ -19,7 +19,7 @@ endif(LIBUSB_FOUND AND LIMESUITE_FOUND)
find_package(LibIIO)
if(LIBUSB_FOUND AND LIBIIO_FOUND)
add_subdirectory(plutosdrinput)
add_subdirectory(plutosdroutput)
endif(LIBUSB_FOUND AND LIBIIO_FOUND)
find_package(CM256cc)

View File

@ -38,28 +38,27 @@ endif (BUILD_DEBIAN)
#include(${QT_USE_FILE})
#add_definitions(${QT_DEFINITIONS})
add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)
#qt4_wrap_cpp(plutosdroutput_HEADERS_MOC ${plutosdroutput_HEADERS})
qt5_wrap_ui(plutosdroutput_FORMS_HEADERS ${plutosdroutput_FORMS})
add_library(inputplutosdr SHARED
add_library(outputplutosdr SHARED
${plutosdroutput_SOURCES}
${plutosdroutput_HEADERS_MOC}
${plutosdroutput_FORMS_HEADERS}
)
if (BUILD_DEBIAN)
target_link_libraries(inputplutosdr
target_link_libraries(outputplutosdr
${QT_LIBRARIES}
iio
sdrbase
plutosdrdevice
)
else (BUILD_DEBIAN)
target_link_libraries(inputplutosdr
target_link_libraries(outputplutosdr
${QT_LIBRARIES}
${LIBIIO_LIBRARIES}
sdrbase
@ -67,6 +66,6 @@ target_link_libraries(inputplutosdr
)
endif (BUILD_DEBIAN)
qt5_use_modules(inputplutosdr Core Widgets)
qt5_use_modules(outputplutosdr Core Widgets)
install(TARGETS inputplutosdr DESTINATION lib/plugins/samplesource)
install(TARGETS outputplutosdr DESTINATION lib/plugins/sampleink)

View File

@ -96,7 +96,7 @@ void PlutoSDROutputThread::run()
if (nbytes_tx < 0)
{
printf("PlutoSDRInputThread::run: error pushing buf %d\n", (int) nbytes_tx);
qDebug("PlutoSDROutputThread::run: error pushing buf %d\n", (int) nbytes_tx);
usleep(200000);
continue;
}

View File

@ -48,7 +48,7 @@ private:
DevicePlutoSDRBox *m_plutoBox;
int16_t *m_buf; //!< holds I+Q values of each sample from devce
int16_t *m_bufConv; //!< holds I+Q values of each sample converted to host format via iio_channel_convert
// int16_t *m_bufConv; //!< holds I+Q values of each sample converted to host format via iio_channel_convert
uint32_t m_blockSizeSamples; //!< buffer sizes in number of (I,Q) samples
SampleSourceFifo* m_sampleFifo; //!< DSP sample FIFO (I,Q)

View File

@ -38,7 +38,6 @@ endif (BUILD_DEBIAN)
#include(${QT_USE_FILE})
#add_definitions(${QT_DEFINITIONS})
add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)