mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-02 06:04:39 -04:00
SDRDaemon: removed references to nanomsg entirely
This commit is contained in:
@@ -53,7 +53,6 @@ target_include_directories(inputsdrdaemonsource PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
|
||||
${LIBCM256CCSRC}
|
||||
${LIBNANOMSG_INCLUDE_DIR}
|
||||
)
|
||||
else (BUILD_DEBIAN)
|
||||
target_include_directories(inputsdrdaemonsource PUBLIC
|
||||
@@ -61,7 +60,6 @@ target_include_directories(inputsdrdaemonsource PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
|
||||
${CM256CC_INCLUDE_DIR}
|
||||
${LIBNANOMSG_INCLUDE_DIR}
|
||||
)
|
||||
endif (BUILD_DEBIAN)
|
||||
|
||||
@@ -69,7 +67,6 @@ if (BUILD_DEBIAN)
|
||||
target_link_libraries(inputsdrdaemonsource
|
||||
${QT_LIBRARIES}
|
||||
cm256cc
|
||||
${LIBNANOMSG_LIBRARIES}
|
||||
sdrbase
|
||||
sdrgui
|
||||
swagger
|
||||
@@ -78,7 +75,6 @@ else (BUILD_DEBIAN)
|
||||
target_link_libraries(inputsdrdaemonsource
|
||||
${QT_LIBRARIES}
|
||||
${CM256CC_LIBRARIES}
|
||||
${LIBNANOMSG_LIBRARIES}
|
||||
sdrbase
|
||||
sdrgui
|
||||
swagger
|
||||
|
||||
@@ -10,7 +10,7 @@ Please note that there is no provision for handling out of sync UDP blocks. It i
|
||||
|
||||
<h2>Build</h2>
|
||||
|
||||
The plugin will be built only if `libnanomsg` and the [CM256cc library](https://github.com/f4exb/cm256cc) is installed in your system. `libnanomasg` is present in most distributions and the dev version can be installed using the package manager. For CM256cc library you will have to specify the include and library paths on the cmake command line. Say if you install cm256cc in `/opt/install/cm256cc` you will have to add `-DCM256CC_INCLUDE_DIR=/opt/install/cm256cc/include/cm256cc -DCM256CC_LIBRARIES=/opt/install/cm256cc/lib/libcm256cc.so` to the cmake commands.
|
||||
The plugin will be built only if the [CM256cc library](https://github.com/f4exb/cm256cc) is installed in your system. For CM256cc library you will have to specify the include and library paths on the cmake command line. Say if you install cm256cc in `/opt/install/cm256cc` you will have to add `-DCM256CC_INCLUDE_DIR=/opt/install/cm256cc/include/cm256cc -DCM256CC_LIBRARIES=/opt/install/cm256cc/lib/libcm256cc.so` to the cmake commands.
|
||||
|
||||
<h2>Interface</h2>
|
||||
|
||||
|
||||
@@ -11,9 +11,6 @@ QT += core gui widgets multimedia network opengl
|
||||
|
||||
TARGET = inputsdrdaemonsource
|
||||
|
||||
CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
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"
|
||||
@@ -22,7 +19,6 @@ INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH += ../../../sdrbase
|
||||
INCLUDEPATH += ../../../sdrgui
|
||||
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
|
||||
!macx:INCLUDEPATH += $$LIBNANOMSGSRC/src
|
||||
macx:INCLUDEPATH += /opt/local/include
|
||||
INCLUDEPATH += $$LIBCM256CCSRC
|
||||
|
||||
@@ -60,8 +56,6 @@ 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/opt/local/lib -lnanomsg
|
||||
LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc
|
||||
|
||||
RESOURCES = ../../../sdrgui/resources/res.qrc
|
||||
|
||||
@@ -19,15 +19,6 @@
|
||||
#include <sys/time.h>
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <nn.h>
|
||||
#include <pair.h>
|
||||
#else
|
||||
#include <nanomsg/nn.h>
|
||||
#include <nanomsg/pair.h>
|
||||
#endif
|
||||
|
||||
#include "SWGDeviceSettings.h"
|
||||
#include "SWGDeviceState.h"
|
||||
#include "SWGDeviceReport.h"
|
||||
|
||||
Reference in New Issue
Block a user