build fixes

This commit is contained in:
Wim Taymans 2017-07-04 11:30:49 +02:00
parent 4558073da6
commit 8886f5d373
4 changed files with 19 additions and 12 deletions

View file

@ -2,12 +2,12 @@
alsa_dep = dependency('alsa')
v4l2_dep = dependency('libv4l2')
xv_dep = dependency('x11')
sdl_dep = dependency('sdl2')
avcodec_dep = dependency('libavcodec')
avformat_dep = dependency('libavformat')
avfilter_dep = dependency('libavfilter')
libva_dep = dependency('libva')
x11_dep = dependency('x11', required : false)
sdl_dep = dependency('sdl2', required : false)
avcodec_dep = dependency('libavcodec', required : false)
avformat_dep = dependency('libavformat', required : false)
avfilter_dep = dependency('libavfilter', required : false)
libva_dep = dependency('libva', required : false)
libudev_dep = dependency('libudev')
threads_dep = dependency('threads')

View file

@ -1,7 +1,9 @@
subdir('alsa')
subdir('audiomixer')
subdir('audiotestsrc')
subdir('ffmpeg')
if avcodec_dep.found()
subdir('ffmpeg')
endif
subdir('support')
subdir('test')
subdir('videotestsrc')

View file

@ -18,11 +18,13 @@ executable('stress-ringbuffer', 'stress-ringbuffer.c',
include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, pthread_lib],
install : false)
executable('test-v4l2', 'test-v4l2.c',
include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, sdl_dep, pthread_lib],
link_with : spalib,
install : false)
if sdl_dep.found()
executable('test-v4l2', 'test-v4l2.c',
include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, sdl_dep, pthread_lib],
link_with : spalib,
install : false)
endif
executable('test-props', 'test-props.c',
include_directories : [spa_inc, spa_libinc ],
dependencies : [],