diff options
Diffstat (limited to 'subprojects/packagefiles/ffmpeg')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index d1c9d5a..511b233 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -17,14 +17,19 @@ if not is_debug endif extra_options += ['--cc=' + compiler.cmd_array()[0]] +extra_options += ['--arch=' + cpu] extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')] +if cpu == 'x86_64' or cpu == 'x86' + extra_options += ['--enable-x86asm'] +endif + if is_windows if is_64bit - extra_options += ['--target-os=win64', '--arch=x86_64'] + extra_options += ['--target-os=win64'] else - extra_options += ['--target-os=win32', '--arch=x86'] + extra_options += ['--target-os=win32'] endif if is_msvc extra_options += ['--toolchain=msvc'] @@ -63,8 +68,9 @@ proj = ext_proj.add_project('configure', '--incdir=@PREFIX@/@INCLUDEDIR@', '--enable-pic', '--enable-static', - '--disable-logging', '--disable-shared', + '--disable-stripping', + '--disable-logging', '--disable-all', '--disable-autodetect', '--disable-everything', @@ -88,11 +94,11 @@ proj = ext_proj.add_project('configure', '--disable-alsa', '--disable-xlib', '--disable-vulkan', - '--enable-nonfree', + '--enable-gpl', + '--enable-version3', '--enable-runtime-cpudetect', '--enable-asm', '--enable-inline-asm', - '--enable-x86asm', '--enable-avutil', '--enable-avformat', '--enable-avcodec', |