Merge branch 'dev' of /shared/development/sdrangel into dev

plugins/channelrx/demodam/demodam.pro

@@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -39,5 +40,6 @@ FORMS += amdemodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
 RESOURCES = ../../../sdrgui/resources/res.qrc

swagger/swagger.pro

@@ -8,6 +8,7 @@ QT += core network
 
 TEMPLATE = lib
 TARGET = swagger
+INCLUDEPATH += ../exports
 INCLUDEPATH += $$PWD/sdrangel/code/qt5/client
 
 win32 {