fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve handling of missing radio_tool dependency

This commit is contained in:
Niccolò Izzo 2020-10-22 21:55:54 +02:00
parent 838490574e
commit 190548a0d0
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -170,8 +170,8 @@ targets = [
] ]
objcopy = find_program('objcopy', required:false) objcopy = find_program('objcopy', required:false, disabler:true)
radio_tool = find_program('radio_tool', required:false) radio_tool = find_program('radio_tool', required:false, disabler:true)
foreach t : targets foreach t : targets
@ -180,13 +180,11 @@ foreach t : targets
if t['flashable'] if t['flashable']
if objcopy.found()
bin = custom_target(name+'_bin', bin = custom_target(name+'_bin',
output : name+'_bin', output : name+'_bin',
input : exe, input : exe,
command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@']) command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@'])
if radio_tool.found()
wrap = custom_target(name+'_wrap', wrap = custom_target(name+'_wrap',
output : name+'_wrap', output : name+'_wrap',
input : bin, input : bin,
@ -201,6 +199,4 @@ foreach t : targets
output : name+'_flash', output : name+'_flash',
command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@']) command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@'])
endif endif
endif
endif
endforeach endforeach