Windows build adjustments

This commit is contained in:
f4exb 2019-03-25 07:44:58 +01:00
parent a6aa81cc30
commit 0edf1d20e2
2 changed files with 7 additions and 6 deletions

View File

@ -36,7 +36,7 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesource/bladerf2input
SUBDIRS += plugins/samplesource/filesource SUBDIRS += plugins/samplesource/filesource
SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/hackrfinput
SUBDIRS += plugins/samplesource/limesdrinput SUBDIRS += plugins/samplesource/limesdrinput
CONFIG(!MSVC):SUBDIRS += plugins/samplesource/plutosdrinput SUBDIRS += plugins/samplesource/plutosdrinput
CONFIG(MSVC):SUBDIRS += plugins/samplesource/remoteinput CONFIG(MSVC):SUBDIRS += plugins/samplesource/remoteinput
SUBDIRS += plugins/samplesource/rtlsdr SUBDIRS += plugins/samplesource/rtlsdr
CONFIG(MSVC):SUBDIRS += plugins/samplesource/soapysdrinput CONFIG(MSVC):SUBDIRS += plugins/samplesource/soapysdrinput
@ -46,15 +46,15 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf1output
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf2output CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf2output
SUBDIRS += plugins/samplesink/hackrfoutput SUBDIRS += plugins/samplesink/hackrfoutput
SUBDIRS += plugins/samplesink/limesdroutput 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/remoteoutput
CONFIG(MSVC):SUBDIRS += plugins/samplesink/soapysdroutput CONFIG(MSVC):SUBDIRS += plugins/samplesink/soapysdroutput
SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/chanalyzer
SUBDIRS += plugins/channelrx/demodam 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
SUBDIRS += plugins/channelrx/demoddsd SUBDIRS += plugins/channelrx/demoddsd
CONFIG(MSVC):SUBDIRS += plugins/channelrx/demoddatv
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

View File

@ -5,8 +5,8 @@ SET libiconvdir="C:\softs\iconv-1.9.2.win32"
SET libzlib1dir="C:\softs\zlib-1.2.5" SET libzlib1dir="C:\softs\zlib-1.2.5"
SET pothosdir="C:\Program Files\PothosSDR" SET pothosdir="C:\Program Files\PothosSDR"
SET pthreadsdir="C:\softs\pthreads-w32" SET pthreadsdir="C:\softs\pthreads-w32"
SET ffmpegdir="C:\softs\ffmpeg-20181127-1035206-win64-shared\bin" SET ffmpegdir="C:\softs\ffmpeg-20190308-9645147-win64-shared\bin"
SET qt5dir="C:\Qt\5.11.1\msvc2017_64\bin" SET qt5dir="C:\Qt\5.12.1\msvc2017_64\bin"
SET libopusdir="C:\softs\libopus_v1.3_msvc15\bin\x64" SET libopusdir="C:\softs\libopus_v1.3_msvc15\bin\x64"
copy app\%1\sdrangel.exe %2 copy app\%1\sdrangel.exe %2
@ -23,11 +23,12 @@ copy swagger\%1\swagger.dll %2
copy logging\%1\logging.dll %2 copy logging\%1\logging.dll %2
copy cm256cc\%1\cm256cc.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 librtlsdr\%1\librtlsdr.dll %2
copy libairspy\%1\libairspy.dll %2 copy libairspy\%1\libairspy.dll %2
copy libairspyhf\%1\libairspyhf.dll %2 copy libairspyhf\%1\libairspyhf.dll %2
copy %pothosdir%\bin\bladeRF.dll %2 copy %pothosdir%\bin\bladeRF.dll %2
copy %pothosdir%\bin\hackrf.dll %2
copy %pothosdir%\bin\libiio.dll %2 copy %pothosdir%\bin\libiio.dll %2
copy %pothosdir%\bin\LimeSuite.dll %2 copy %pothosdir%\bin\LimeSuite.dll %2
copy %pothosdir%\bin\SoapySDR.dll %2 copy %pothosdir%\bin\SoapySDR.dll %2