From 641e6b529f61640a1f520b613e37d680b6495e9c Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <egriffiths@amadeus.com>
Date: Sun, 27 Mar 2016 12:12:57 +0200
Subject: [PATCH] Windows build: removed nanomsg and sdrdaemon input plugin
 from the build

---
 .gitignore                                   | 1 +
 nanomsg/nanomsg.pro                          | 3 ++-
 plugins/samplesource/sdrdaemon/sdrdaemon.pro | 5 +++++
 sdrangel.windows.pro                         | 4 ++--
 windows.install.bat                          | 1 -
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7c0fa7c6..5901da274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ sdrangelove.supp
 .project
 .settings/
 *.cs
+*.pro.user
diff --git a/nanomsg/nanomsg.pro b/nanomsg/nanomsg.pro
index 6d265cf32..79c43cb64 100644
--- a/nanomsg/nanomsg.pro
+++ b/nanomsg/nanomsg.pro
@@ -261,4 +261,5 @@ $$LIBNANOMSGSRC/src/utils/thread_win.inc\
 $$LIBNANOMSGSRC/src/transports/utils/dns_getaddrinfo.inc\
 $$LIBNANOMSGSRC/src/transports/utils/dns_getaddrinfo_a.inc
 
-CONFIG(MINGW32):LIBS += -lws2_32 -lmswsock -ladvapi32
+#CONFIG(MINGW32):LIBS += -lws2_32 -lmswsock -ladvapi32
+CONFIG(MINGW32):LIBS += -lws2_32 -lmswsock
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemon.pro b/plugins/samplesource/sdrdaemon/sdrdaemon.pro
index 56283323a..657df6ac8 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemon.pro
+++ b/plugins/samplesource/sdrdaemon/sdrdaemon.pro
@@ -10,9 +10,13 @@ CONFIG += plugin
 QT += core gui widgets multimedia network
 
 TARGET = inputsdrdaemon
+
+CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
+
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../lz4
+INCLUDEPATH += $$LIBNANOMSGSRC/src
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -33,6 +37,7 @@ FORMS += sdrdaemongui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../lz4/$${build_subdir} -llz4
+LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
 
 RESOURCES = ../../../sdrbase/resources/res.qrc
 
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 950729da0..0221378f2 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -7,7 +7,7 @@
 TEMPLATE = subdirs
 SUBDIRS = sdrbase
 SUBDIRS += lz4
-SUBDIRS += nanomsg
+#SUBDIRS += nanomsg
 SUBDIRS += fcdhid
 SUBDIRS += fcdlib
 SUBDIRS += librtlsdr
@@ -15,7 +15,7 @@ SUBDIRS += libhackrf
 SUBDIRS += libairspy
 SUBDIRS += libbladerf
 SUBDIRS += plugins/samplesource/filesource
-SUBDIRS += plugins/samplesource/sdrdaemon
+#SUBDIRS += plugins/samplesource/sdrdaemon
 SUBDIRS += plugins/samplesource/rtlsdr
 SUBDIRS += plugins/samplesource/hackrf
 SUBDIRS += plugins/samplesource/airspy
diff --git a/windows.install.bat b/windows.install.bat
index 739e3d493..7997caffb 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -21,7 +21,6 @@ copy plugins\channel\demodwfm\%1\demodwfm.dll %2\plugins\channel
 copy plugins\channel\tcpsrc\%1\tcpsrc.dll %2\plugins\channel
 copy plugins\channel\udpsrc\%1\udpsrc.dll %2\plugins\channel
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
-copy plugins\samplesource\sdrdaemon\%1\inputsdrdaemon.dll %2\plugins\samplesource
 copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
 copy plugins\samplesource\hackrf\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource