mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-03-28 07:08:38 -04:00
Merge branch 'dev' of /shared/development/sdrangel into dev
This commit is contained in:
commit
408b80fa1d
@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
|
|||||||
INCLUDEPATH += ../../../exports
|
INCLUDEPATH += ../../../exports
|
||||||
INCLUDEPATH += ../../../sdrbase
|
INCLUDEPATH += ../../../sdrbase
|
||||||
INCLUDEPATH += ../../../sdrgui
|
INCLUDEPATH += ../../../sdrgui
|
||||||
|
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
|
||||||
|
|
||||||
CONFIG(Release):build_subdir = release
|
CONFIG(Release):build_subdir = release
|
||||||
CONFIG(Debug):build_subdir = debug
|
CONFIG(Debug):build_subdir = debug
|
||||||
@ -39,5 +40,6 @@ FORMS += amdemodgui.ui
|
|||||||
|
|
||||||
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
|
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
|
||||||
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
|
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
|
||||||
|
LIBS += -L../../../swagger/$${build_subdir} -lswagger
|
||||||
|
|
||||||
RESOURCES = ../../../sdrgui/resources/res.qrc
|
RESOURCES = ../../../sdrgui/resources/res.qrc
|
||||||
|
@ -8,6 +8,7 @@ QT += core network
|
|||||||
|
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = swagger
|
TARGET = swagger
|
||||||
|
INCLUDEPATH += ../exports
|
||||||
INCLUDEPATH += $$PWD/sdrangel/code/qt5/client
|
INCLUDEPATH += $$PWD/sdrangel/code/qt5/client
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
Loading…
Reference in New Issue
Block a user