From f76fafe8263c7313f761f986a869ed31133f4711 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 10 Jun 2018 12:17:26 +0200 Subject: [PATCH] Windows build fix --- .../{chanalyzerng.pro => chanalyzer.pro} | 20 +++++++++---------- plugins/channelrx/demodbfm/demodbfm.pro | 2 ++ plugins/channelrx/demoddsd/demoddsd.pro | 2 ++ plugins/channelrx/demodssb/demodssb.pro | 2 ++ plugins/channelrx/demodwfm/demodwfm.pro | 2 ++ plugins/channelrx/udpsrc/udpsrc.pro | 2 ++ sdrangel.windows.pro | 2 -- 7 files changed, 20 insertions(+), 12 deletions(-) rename plugins/channelrx/chanalyzer/{chanalyzerng.pro => chanalyzer.pro} (77%) diff --git a/plugins/channelrx/chanalyzer/chanalyzerng.pro b/plugins/channelrx/chanalyzer/chanalyzer.pro similarity index 77% rename from plugins/channelrx/chanalyzer/chanalyzerng.pro rename to plugins/channelrx/chanalyzer/chanalyzer.pro index 0960426e8..2731e8062 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerng.pro +++ b/plugins/channelrx/chanalyzer/chanalyzer.pro @@ -9,7 +9,7 @@ CONFIG += plugin QT += core gui widgets multimedia opengl -TARGET = chanalyzerng +TARGET = chanalyzer DEFINES += USE_SSE2=1 QMAKE_CXXFLAGS += -msse2 @@ -30,18 +30,18 @@ CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug -SOURCES += chanalyzerng.cpp\ - chanalyzernggui.cpp\ - chanalyzerngplugin.cpp\ - chanalyzerngsettings.cpp\ +SOURCES += chanalyzer.cpp\ + chanalyzergui.cpp\ + chanalyzerplugin.cpp\ + chanalyzersettings.cpp\ -HEADERS += chanalyzerng.h\ - chanalyzernggui.h\ - chanalyzerngplugin.h\ - chanalyzerngplugin.h +HEADERS += chanalyzer.h\ + chanalyzergui.h\ + chanalyzerplugin.h\ + chanalyzerplugin.h -FORMS += chanalyzernggui.ui +FORMS += chanalyzergui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui diff --git a/plugins/channelrx/demodbfm/demodbfm.pro b/plugins/channelrx/demodbfm/demodbfm.pro index f0a75c3c3..7bcca3657 100644 --- a/plugins/channelrx/demodbfm/demodbfm.pro +++ b/plugins/channelrx/demodbfm/demodbfm.pro @@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrgui +INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" @@ -52,5 +53,6 @@ FORMS += bfmdemodgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/channelrx/demoddsd/demoddsd.pro b/plugins/channelrx/demoddsd/demoddsd.pro index fb0c31393..8ea93c839 100644 --- a/plugins/channelrx/demoddsd/demoddsd.pro +++ b/plugins/channelrx/demoddsd/demoddsd.pro @@ -33,6 +33,7 @@ INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrgui +INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += $$LIBDSDCCSRC INCLUDEPATH += $$LIBMBELIBSRC @@ -60,6 +61,7 @@ dsdstatustextdialog.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../dsdcc/$${build_subdir} -ldsdcc RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/channelrx/demodssb/demodssb.pro b/plugins/channelrx/demodssb/demodssb.pro index c9612f7d6..9fa689509 100644 --- a/plugins/channelrx/demodssb/demodssb.pro +++ b/plugins/channelrx/demodssb/demodssb.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 += ssbdemodgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/channelrx/demodwfm/demodwfm.pro b/plugins/channelrx/demodwfm/demodwfm.pro index 4952543b4..ebb9c8859 100644 --- a/plugins/channelrx/demodwfm/demodwfm.pro +++ b/plugins/channelrx/demodwfm/demodwfm.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 += wfmdemodgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/channelrx/udpsrc/udpsrc.pro b/plugins/channelrx/udpsrc/udpsrc.pro index f78274edd..e8843d37b 100644 --- a/plugins/channelrx/udpsrc/udpsrc.pro +++ b/plugins/channelrx/udpsrc/udpsrc.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 += udpsrcgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 8bf10973c..2d0516235 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -47,7 +47,6 @@ SUBDIRS += plugins/samplesink/hackrfoutput SUBDIRS += plugins/samplesink/limesdroutput SUBDIRS += plugins/samplesink/plutosdroutput SUBDIRS += plugins/channelrx/chanalyzer -SUBDIRS += plugins/channelrx/chanalyzerng SUBDIRS += plugins/channelrx/demodam SUBDIRS += plugins/channelrx/demodatv SUBDIRS += plugins/channelrx/demodbfm @@ -56,7 +55,6 @@ SUBDIRS += plugins/channelrx/demodlora SUBDIRS += plugins/channelrx/demodnfm SUBDIRS += plugins/channelrx/demodssb SUBDIRS += plugins/channelrx/demodwfm -SUBDIRS += plugins/channelrx/tcpsrc SUBDIRS += plugins/channelrx/udpsrc SUBDIRS += plugins/channeltx/modam SUBDIRS += plugins/channeltx/modnfm