From 35e787f89b82fe915a6f83951c0211a6c02b3aa0 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 28 Nov 2018 14:23:25 +0100 Subject: [PATCH] Windows MSVC2017: added DSD demodulator --- dsdcc/dsdcc.pro | 9 +++++++-- mbelib/mbelib.pro | 3 +++ plugins/channelrx/demoddatv/datvdemodplugin.cpp | 2 +- plugins/channelrx/demoddsd/demoddsd.pro | 3 +++ plugins/channelrx/demoddsd/dsddemodplugin.cpp | 2 +- sdrangel.windows.pro | 4 ++-- windowsms.install.bat | 4 ++-- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dsdcc/dsdcc.pro b/dsdcc/dsdcc.pro index e89ae3230..89dc3b67a 100644 --- a/dsdcc/dsdcc.pro +++ b/dsdcc/dsdcc.pro @@ -9,6 +9,8 @@ QT += core TEMPLATE = lib TARGET = dsdcc +CONFIG(MSVC):DEFINES += dsdcc_EXPORTS + CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc" @@ -52,7 +54,8 @@ $$LIBDSDCCSRC/viterbi5.cpp\ $$LIBDSDCCSRC/pn.cpp\ $$LIBDSDCCSRC/mbefec.cpp\ $$LIBDSDCCSRC/phaselock.cpp\ -$$LIBDSDCCSRC/locator.cpp +$$LIBDSDCCSRC/locator.cpp\ +$$LIBDSDCCSRC/timeutil.cpp HEADERS = $$LIBDSDCCSRC/descramble.h\ $$LIBDSDCCSRC/dmr.h\ @@ -82,6 +85,8 @@ $$LIBDSDCCSRC/viterbi5.h\ $$LIBDSDCCSRC/pn.h\ $$LIBDSDCCSRC/mbefec.h\ $$LIBDSDCCSRC/phaselock.h\ -$$LIBDSDCCSRC/locator.h +$$LIBDSDCCSRC/locator.h\ +$$LIBDSDCCSRC/timeutil.h\ +$$LIBDSDCCSRC/export.h LIBS += -L../mbelib/$${build_subdir} -lmbelib diff --git a/mbelib/mbelib.pro b/mbelib/mbelib.pro index 9fa45a02b..57cb623f2 100644 --- a/mbelib/mbelib.pro +++ b/mbelib/mbelib.pro @@ -9,6 +9,8 @@ QT += core TEMPLATE = lib TARGET = mbelib +CONFIG(MSVC):DEFINES += mbelib_EXPORTS + CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib" @@ -28,4 +30,5 @@ $$LIBMBELIBSRC/ambe3600x2450_const.h\ $$LIBMBELIBSRC/ecc_const.h\ $$LIBMBELIBSRC/imbe7200x4400_const.h\ $$LIBMBELIBSRC/mbelib.h\ +$$LIBMBELIBSRC/export.h\ $$LIBMBELIBSRC/mbelib_const.h diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp index 346a898ff..0fe293803 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp +++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor = { QString("DATV Demodulator"), - QString("4.0.1"), + QString("4.3.1"), QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channelrx/demoddsd/demoddsd.pro b/plugins/channelrx/demoddsd/demoddsd.pro index 8b8c96bc7..d9e085168 100644 --- a/plugins/channelrx/demoddsd/demoddsd.pro +++ b/plugins/channelrx/demoddsd/demoddsd.pro @@ -19,14 +19,17 @@ QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" +CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(macx):LIBDSDCCSRC = "../../../../deps/dsdcc" CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" +CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib" CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" INCLUDEPATH += $$PWD diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 0d14131da..4f8835841 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = { QString("DSD Demodulator"), - QString("4.2.4"), + QString("4.3.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index e3d5885f6..a85891506 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -27,7 +27,7 @@ CONFIG(!MSVC):SUBDIRS += libperseus SUBDIRS += librtlsdr SUBDIRS += devices SUBDIRS += mbelib -CONFIG(!MSVC):SUBDIRS += dsdcc +SUBDIRS += dsdcc CONFIG(MSVC):SUBDIRS += cm256cc SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/airspyhf @@ -54,7 +54,7 @@ SUBDIRS += plugins/channelrx/demodam SUBDIRS += plugins/channelrx/demodatv SUBDIRS += plugins/channelrx/demodbfm CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv -CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd +SUBDIRS += plugins/channelrx/demoddsd CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora SUBDIRS += plugins/channelrx/demodnfm SUBDIRS += plugins/channelrx/demodssb diff --git a/windowsms.install.bat b/windowsms.install.bat index e7022b617..6453a7233 100644 --- a/windowsms.install.bat +++ b/windowsms.install.bat @@ -14,7 +14,7 @@ copy sdrbase\res.qrb %2\sdrbase.rcc copy sdrgui\%1\sdrgui.dll %2 copy devices\%1\devices.dll %2 copy mbelib\%1\mbelib.dll %2 -REM copy dsdcc\%1\dsdcc.dll %2 +copy dsdcc\%1\dsdcc.dll %2 copy serialdv\%1\serialdv.dll %2 copy httpserver\%1\httpserver.dll %2 copy qrtplib\%1\qrtplib.dll %2 @@ -55,7 +55,7 @@ copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx copy plugins\channelrx\demoddatv\%1\demoddatv.dll %2\plugins\channelrx -REM copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx +copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx REM copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx