Browse Source

Windows build: removed nanomsg and sdrdaemon input plugin from the build

chirpmodem-v8.0.0
Edouard Griffiths 11 years ago
parent
commit
641e6b529f
  1. 1
      .gitignore
  2. 3
      nanomsg/nanomsg.pro
  3. 5
      plugins/samplesource/sdrdaemon/sdrdaemon.pro
  4. 4
      sdrangel.windows.pro
  5. 1
      windows.install.bat

1
.gitignore vendored

@ -8,3 +8,4 @@ sdrangelove.supp @@ -8,3 +8,4 @@ sdrangelove.supp
.project
.settings/
*.cs
*.pro.user

3
nanomsg/nanomsg.pro

@ -261,4 +261,5 @@ $$LIBNANOMSGSRC/src/utils/thread_win.inc\ @@ -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

5
plugins/samplesource/sdrdaemon/sdrdaemon.pro

@ -10,9 +10,13 @@ CONFIG += plugin @@ -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 @@ -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

4
sdrangel.windows.pro

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

1
windows.install.bat

@ -21,7 +21,6 @@ copy plugins\channel\demodwfm\%1\demodwfm.dll %2\plugins\channel @@ -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

Loading…
Cancel
Save