From 0edf1d20e26de8ead3a991dc6310d4874c7d99fc Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 25 Mar 2019 07:44:58 +0100 Subject: [PATCH] Windows build adjustments --- sdrangel.windows.pro | 6 +++--- windowsms.install.bat | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index fb5bbcd0e..33c5e0540 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -36,7 +36,7 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesource/bladerf2input SUBDIRS += plugins/samplesource/filesource SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/limesdrinput -CONFIG(!MSVC):SUBDIRS += plugins/samplesource/plutosdrinput +SUBDIRS += plugins/samplesource/plutosdrinput CONFIG(MSVC):SUBDIRS += plugins/samplesource/remoteinput SUBDIRS += plugins/samplesource/rtlsdr CONFIG(MSVC):SUBDIRS += plugins/samplesource/soapysdrinput @@ -46,15 +46,15 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf1output CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf2output SUBDIRS += plugins/samplesink/hackrfoutput SUBDIRS += plugins/samplesink/limesdroutput -CONFIG(!MSVC):SUBDIRS += plugins/samplesink/plutosdroutput +SUBDIRS += plugins/samplesink/plutosdroutput CONFIG(MSVC):SUBDIRS += plugins/samplesink/remoteoutput CONFIG(MSVC):SUBDIRS += plugins/samplesink/soapysdroutput SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/demodam SUBDIRS += plugins/channelrx/demodatv SUBDIRS += plugins/channelrx/demodbfm -CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv SUBDIRS += plugins/channelrx/demoddsd +CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv 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 5a253e301..c437b01d4 100644 --- a/windowsms.install.bat +++ b/windowsms.install.bat @@ -5,8 +5,8 @@ SET libiconvdir="C:\softs\iconv-1.9.2.win32" SET libzlib1dir="C:\softs\zlib-1.2.5" SET pothosdir="C:\Program Files\PothosSDR" SET pthreadsdir="C:\softs\pthreads-w32" -SET ffmpegdir="C:\softs\ffmpeg-20181127-1035206-win64-shared\bin" -SET qt5dir="C:\Qt\5.11.1\msvc2017_64\bin" +SET ffmpegdir="C:\softs\ffmpeg-20190308-9645147-win64-shared\bin" +SET qt5dir="C:\Qt\5.12.1\msvc2017_64\bin" SET libopusdir="C:\softs\libopus_v1.3_msvc15\bin\x64" copy app\%1\sdrangel.exe %2 @@ -23,11 +23,12 @@ copy swagger\%1\swagger.dll %2 copy logging\%1\logging.dll %2 copy cm256cc\%1\cm256cc.dll %2 -copy libhackrf\%1\libhackrf.dll %2 +REM copy libhackrf\%1\libhackrf.dll %2 copy librtlsdr\%1\librtlsdr.dll %2 copy libairspy\%1\libairspy.dll %2 copy libairspyhf\%1\libairspyhf.dll %2 copy %pothosdir%\bin\bladeRF.dll %2 +copy %pothosdir%\bin\hackrf.dll %2 copy %pothosdir%\bin\libiio.dll %2 copy %pothosdir%\bin\LimeSuite.dll %2 copy %pothosdir%\bin\SoapySDR.dll %2