Windows build: apply modifications

plugins/channel/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(demod)
 
 add_subdirectory(lora)
-add_subdirectory(am)
+add_subdirectory(demodam)
 add_subdirectory(bfm)
 add_subdirectory(nfm)
 add_subdirectory(ssb)

plugins/channel/chanalyzer/chanalyzer.pro

@@ -0,0 +1,34 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia opengl
+
+TARGET = chanalyzer
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../sdrbase
+
+CONFIG(ANDROID):INCLUDEPATH += /opt/build/Boost-for-Android-Prebuilt/boost_1_53_0/include
+CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES += chanalyzer.cpp\
+	chanalyzergui.cpp\
+	chanalyzerplugin.cpp
+
+HEADERS += chanalyzer.h\
+chanalyzergui.h\
+chanalyzerplugin.h
+
+FORMS += chanalyzergui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+
+RESOURCES = ../../../sdrbase/resources/res.qrc

plugins/channel/demodam/demodam.pro

@@ -29,6 +29,3 @@ FORMS += amdemodgui.ui
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 
 RESOURCES = ../../../sdrbase/resources/res.qrc
-
-target.path = ../../../dist/$${build_subdir}/plugins/channel
-CONFIG(MINGW32):INSTALLS += target

plugins/samplesource/sdrdaemon/sdrdaemon.pro

@@ -0,0 +1,35 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia network
+
+TARGET = inputsdrdaemon
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../sdrbase
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES += sdrdaemonbuffer.cpp\
+sdrdaemongui.cpp\
+sdrdaemoninput.cpp\
+sdrdaemonplugin.cpp\
+sdrdaemonudphandler.cpp
+
+HEADERS += sdrdaemonbuffer.h\
+sdrdaemongui.h\
+sdrdaemoninput.h\
+sdrdaemonplugin.h\
+sdrdaemonudphandler.h
+
+FORMS += sdrdaemongui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+
+RESOURCES = ../../../sdrbase/resources/res.qrc

sdrangel.windows.pro

@@ -7,7 +7,9 @@
 TEMPLATE = subdirs
 SUBDIRS = sdrbase
 SUBDIRS += plugins/samplesource/filesource
-SUBDIRS += plugins/channel/am
+SUBDIRS += plugins/samplesource/sdrdaemon
+SUBDIRS += plugins/channel/demodam
+SUBDIRS += plugins/channel/chanalyzer
 
 # Main app must be last
 CONFIG += ordered

sdrbase/sdrbase.pro

@@ -14,7 +14,7 @@ INCLUDEPATH += $$PWD
 DEFINES += USE_KISSFFT=1
 
 CONFIG(ANDROID):INCLUDEPATH += /opt/build/Boost-for-Android-Prebuilt/boost_1_53_0/include
-CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
+CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_55_0"
 
 SOURCES += mainwindow.cpp\
         audio/audiodeviceinfo.cpp\