From 4dc4ab493bf61fe36a4a69151c874340271e7f35 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 23 Feb 2017 08:33:31 +0100 Subject: [PATCH] Demod ATV: corrections to Windows build and install --- plugins/channelrx/demodatv/demodatv.pro | 7 +++++-- windows.install.bat | 2 +- windows64.install.bat | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/channelrx/demodatv/demodatv.pro b/plugins/channelrx/demodatv/demodatv.pro index 8d2761af4..7ab8a099c 100644 --- a/plugins/channelrx/demodatv/demodatv.pro +++ b/plugins/channelrx/demodatv/demodatv.pro @@ -7,9 +7,9 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl -TARGET = demodam +TARGET = demodatv DEFINES += USE_SSE2=1 QMAKE_CXXFLAGS += -msse2 @@ -22,6 +22,9 @@ INCLUDEPATH += ../../../sdrbase 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" + SOURCES += atvdemod.cpp\ atvdemodgui.cpp\ atvdemodplugin.cpp\ diff --git a/windows.install.bat b/windows.install.bat index 0e07fa9e6..b3719bb9b 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -20,7 +20,7 @@ mkdir %2\plugins\samplesink copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx copy plugins\channelrx\chanalyzerng\%1\chanalyzerng.dll %2\plugins\channelrx copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx -copy plugins\channelrx\demodam\%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\demoddsd\%1\demoddsd.dll %2\plugins\channelrx copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx diff --git a/windows64.install.bat b/windows64.install.bat index 396187fee..58369d79c 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -33,7 +33,7 @@ mkdir %2\plugins\samplesink copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx copy plugins\channelrx\chanalyzerng\%1\chanalyzerng.dll %2\plugins\channelrx copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx -copy plugins\channelrx\demodam\%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\demoddsd\%1\demoddsd.dll %2\plugins\channelrx copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx