VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00
Code Issues Projects Releases Wiki Activity

Windows MSVC2017: added DSD demodulator

Browse Source
This commit is contained in:
f4exb 2018-11-28 14:23:25 +01:00
parent 98544d9dd9
commit 35e787f89b
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dsdcc/dsdcc.pro
View File

@ -9,6 +9,8 @@ QT += core
TEMPLATE = lib TEMPLATE = lib
TARGET = dsdcc TARGET = dsdcc
CONFIG(MSVC):DEFINES += dsdcc_EXPORTS
CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc"
@ -52,7 +54,8 @@ $$LIBDSDCCSRC/viterbi5.cpp\
$$LIBDSDCCSRC/pn.cpp\ $$LIBDSDCCSRC/pn.cpp\
$$LIBDSDCCSRC/mbefec.cpp\ $$LIBDSDCCSRC/mbefec.cpp\
$$LIBDSDCCSRC/phaselock.cpp\ $$LIBDSDCCSRC/phaselock.cpp\
$$LIBDSDCCSRC/locator.cpp $$LIBDSDCCSRC/locator.cpp\
$$LIBDSDCCSRC/timeutil.cpp
HEADERS = $$LIBDSDCCSRC/descramble.h\ HEADERS = $$LIBDSDCCSRC/descramble.h\
$$LIBDSDCCSRC/dmr.h\ $$LIBDSDCCSRC/dmr.h\
@ -82,6 +85,8 @@ $$LIBDSDCCSRC/viterbi5.h\
$$LIBDSDCCSRC/pn.h\ $$LIBDSDCCSRC/pn.h\
$$LIBDSDCCSRC/mbefec.h\ $$LIBDSDCCSRC/mbefec.h\
$$LIBDSDCCSRC/phaselock.h\ $$LIBDSDCCSRC/phaselock.h\
$$LIBDSDCCSRC/locator.h $$LIBDSDCCSRC/locator.h\
$$LIBDSDCCSRC/timeutil.h\
$$LIBDSDCCSRC/export.h
LIBS += -L../mbelib/$${build_subdir} -lmbelib LIBS += -L../mbelib/$${build_subdir} -lmbelib

3
mbelib/mbelib.pro
View File

@ -9,6 +9,8 @@ QT += core
TEMPLATE = lib TEMPLATE = lib
TARGET = mbelib TARGET = mbelib
CONFIG(MSVC):DEFINES += mbelib_EXPORTS
CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib"
@ -28,4 +30,5 @@ $$LIBMBELIBSRC/ambe3600x2450_const.h\
$$LIBMBELIBSRC/ecc_const.h\ $$LIBMBELIBSRC/ecc_const.h\
$$LIBMBELIBSRC/imbe7200x4400_const.h\ $$LIBMBELIBSRC/imbe7200x4400_const.h\
$$LIBMBELIBSRC/mbelib.h\ $$LIBMBELIBSRC/mbelib.h\
$$LIBMBELIBSRC/export.h\
$$LIBMBELIBSRC/mbelib_const.h $$LIBMBELIBSRC/mbelib_const.h

2
plugins/channelrx/demoddatv/datvdemodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor = const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor =
{ {
QString("DATV Demodulator"), QString("DATV Demodulator"),
QString("4.0.1"), QString("4.3.1"),
QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"), QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

3
plugins/channelrx/demoddsd/demoddsd.pro
View File

@ -19,14 +19,17 @@ QMAKE_CXXFLAGS += -std=c++11
CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(macx):LIBDSDCCSRC = "../../../../deps/dsdcc" CONFIG(macx):LIBDSDCCSRC = "../../../../deps/dsdcc"
CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib" CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib"
CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MINGW64):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" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD

2
plugins/channelrx/demoddsd/dsddemodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = { const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
QString("DSD Demodulator"), QString("DSD Demodulator"),
QString("4.2.4"), QString("4.3.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

4
sdrangel.windows.pro
View File

@ -27,7 +27,7 @@ CONFIG(!MSVC):SUBDIRS += libperseus
SUBDIRS += librtlsdr SUBDIRS += librtlsdr
SUBDIRS += devices SUBDIRS += devices
SUBDIRS += mbelib SUBDIRS += mbelib
CONFIG(!MSVC):SUBDIRS += dsdcc SUBDIRS += dsdcc
CONFIG(MSVC):SUBDIRS += cm256cc CONFIG(MSVC):SUBDIRS += cm256cc
SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/airspy
SUBDIRS += plugins/samplesource/airspyhf SUBDIRS += plugins/samplesource/airspyhf
@ -54,7 +54,7 @@ SUBDIRS += plugins/channelrx/demodam
SUBDIRS += plugins/channelrx/demodatv SUBDIRS += plugins/channelrx/demodatv
SUBDIRS += plugins/channelrx/demodbfm SUBDIRS += plugins/channelrx/demodbfm
CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd SUBDIRS += plugins/channelrx/demoddsd
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora
SUBDIRS += plugins/channelrx/demodnfm SUBDIRS += plugins/channelrx/demodnfm
SUBDIRS += plugins/channelrx/demodssb SUBDIRS += plugins/channelrx/demodssb

4
windowsms.install.bat
View File

@ -14,7 +14,7 @@ copy sdrbase\res.qrb %2\sdrbase.rcc
copy sdrgui\%1\sdrgui.dll %2 copy sdrgui\%1\sdrgui.dll %2
copy devices\%1\devices.dll %2 copy devices\%1\devices.dll %2
copy mbelib\%1\mbelib.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 serialdv\%1\serialdv.dll %2
copy httpserver\%1\httpserver.dll %2 copy httpserver\%1\httpserver.dll %2
copy qrtplib\%1\qrtplib.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\demodatv\%1\demodatv.dll %2\plugins\channelrx
copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
copy plugins\channelrx\demoddatv\%1\demoddatv.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 REM copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx
copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx