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

This commit is contained in:
f4exb 2018-03-24 09:13:15 +01:00
commit 408b80fa1d
2 changed files with 3 additions and 0 deletions

View File

@ -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

View File

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