From bacabb8f2b488b3da58dc3ea4159326298a003f6 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 12 Nov 2024 15:53:02 -0500 Subject: Android cross-compile Signed-off-by: Andrew Opalach --- src/codec/meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/codec') diff --git a/src/codec/meson.build b/src/codec/meson.build index d27099a..32a942e 100644 --- a/src/codec/meson.build +++ b/src/codec/meson.build @@ -32,12 +32,14 @@ if get_option('codecs').contains('ffmpeg') libavcodec = ffmpeg_proj.get_variable('avcodec') libswresample = ffmpeg_proj.get_variable('swresample') libswscale = ffmpeg_proj.get_variable('swscale') - # Only used to set include dirs for ffmpeg. - ffmpeg_inc_dep = ffmpeg_proj.get_variable('ffmpeg_inc_dep') - # Extra static dependencies. - zlib = dependency('zlib') - bcrypt = compiler.find_library('bcrypt') - ffmpeg_deps += [ffmpeg_inc_dep, zlib, bcrypt] + # Only used to set include dirs for FFmpeg. + ffmpeg_deps += [ffmpeg_proj.get_variable('ffmpeg_inc_dep')] + # We explicitly enable zlib in the FFmpeg build. + ffmpeg_deps += [dependency('zlib')] + if is_windows + # Extra static dependencies for Windows. + ffmpeg_deps += [compiler.find_library('bcrypt')] + endif soxr = compiler.find_library('soxr', required: false) if soxr.found() ffmpeg_deps += [soxr] -- cgit v1.2.3-101-g0448