Windows MSVC2017: include DATV Demod

3 files changed, 18 insertions, 15 deletions

diff --git a/plugins/channelrx/demoddatv/demoddatv.pro b/plugins/channelrx/demoddatv/demoddatv.pro
index c02e89ad5..46c0404d9 100644
--- a/plugins/channelrx/demoddatv/demoddatv.pro
+++ b/plugins/channelrx/demoddatv/demoddatv.pro
@@ -7,7 +7,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 
-QT += core gui multimedia multimediawidgets widgets opengl
+QT += core gui multimedia multimediawidgets widgets opengl qml
 
 TARGET = demoddatv
 
@@ -18,25 +18,26 @@ QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
-CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
-CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0"
+CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(MSVC):INCLUDEPATH += "C:\softs\ffmpeg-20181127-1035206-win64-dev\include"
 CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
 
 SOURCES += datvdemod.cpp\
-	datvdemodgui.cpp\
-	datvdemodplugin.cpp\
+    datvdemodgui.cpp\
+    datvdemodplugin.cpp\
     datvideostream.cpp \
     datvideorender.cpp
 
 HEADERS += datvdemod.h\
-	datvdemodgui.h\
-	datvdemodplugin.h\
+    datvdemodgui.h\
+    datvdemodplugin.h\
     leansdr/convolutional.h \
     leansdr/dsp.h \
     leansdr/dvb.h \
@@ -58,6 +59,7 @@ FORMS += datvdemodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
-LIBS += -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
+#LIBS += -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
+LIBS += -L"C:\softs\ffmpeg-20181127-1035206-win64-dev\lib" -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
 
 RESOURCES = ../../../sdrbase/resources/res.qrc
diff --git a/plugins/channelrx/demoddatv/leansdr/dvb.h b/plugins/channelrx/demoddatv/leansdr/dvb.h
index 474eab072..8cde82b79 100644
--- a/plugins/channelrx/demoddatv/leansdr/dvb.h
+++ b/plugins/channelrx/demoddatv/leansdr/dvb.h
@@ -671,13 +671,13 @@ static struct fec_spec
 }
 
 fec_specs[FEC_MAX] = {
-    [FEC12] = { 1, 2, polys_fec12 },
-    [FEC23] = { 2, 3, polys_fec23 },
-    [FEC46] = { 4, 6, polys_fec46 },
-    [FEC34] = { 3, 4, polys_fec34 },
-    [FEC56] = { 5, 6, polys_fec56 },
-    [FEC78] = { 7, 8, polys_fec78 },
-    [FEC45] = { 4, 5, polys_fec45 },  // Non-standard
+    { 1, 2, polys_fec12 },
+    { 2, 3, polys_fec23 },
+    { 4, 6, polys_fec46 },
+    { 3, 4, polys_fec34 },
+    { 5, 6, polys_fec56 },
+    { 7, 8, polys_fec78 },
+    { 4, 5, polys_fec45 },  // Non-standard
 };
 
 struct dvb_convol: runnable
diff --git a/plugins/channelrx/demoddatv/leansdr/math.h b/plugins/channelrx/demoddatv/leansdr/math.h
index 26a94b250..ada707f17 100644
--- a/plugins/channelrx/demoddatv/leansdr/math.h
+++ b/plugins/channelrx/demoddatv/leansdr/math.h
@@ -1,6 +1,7 @@
 #ifndef LEANSDR_MATH_H
 #define LEANSDR_MATH_H
 
+#define _USE_MATH_DEFINES
 #include <math.h>
 #include <stdint.h>