diff options
Diffstat (limited to 'subprojects/packagefiles')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 1466086..2faa65e 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -95,26 +95,15 @@ proj = ext_proj.add_project('configure', '--enable-parser=' + parsers, '--enable-bsf=' + bsfs, extra_options, - ], verbose: true) + ], + cross_configure_options: ['--enable-cross-compile'], + verbose: true) -inc = include_directories('.') +avutil = proj.dependency('avutil') +avformat = proj.dependency('avformat') +avcodec = proj.dependency('avcodec') +swresample = proj.dependency('swresample') +swscale = proj.dependency('swscale') -if is_msvc - # TODO: FFmpeg patch to fix all libs coming out as .a. - avutil = proj.dependency('libavutil') - avformat = proj.dependency('libavformat') - avcodec = proj.dependency('libavcodec') - swresample = proj.dependency('libswresample') - swscale = proj.dependency('libswscale') -else - avutil = proj.dependency('avutil') - avformat = proj.dependency('avformat') - avcodec = proj.dependency('avcodec') - swresample = proj.dependency('swresample') - swscale = proj.dependency('swscale') - if is_64bit and is_windows - lib_dir = meson.project_build_root() + '/distlib64' - else - lib_dir = meson.project_build_root() + '/dist/usr/local/lib64' - endif -endif +libdir = meson.project_build_root() + '/dist/usr/locallib' +inc = include_directories('.') |