Mercurial > mplayer.hg
changeset 34547:3bc6555139cd
Update config.asm generation to work with latest FFmpeg.
| author | reimar |
|---|---|
| date | Sat, 28 Jan 2012 14:00:07 +0000 |
| parents | 123345d17f3a |
| children | 215379500aac |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jan 28 13:59:17 2012 +0000 +++ b/configure Sat Jan 28 14:00:07 2012 +0000 @@ -2937,7 +2937,7 @@ echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMVFP VFPV3 NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC AVX MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMVFP VFPV3 NEON IWMMXT MMI VIS MVI' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -8786,11 +8786,9 @@ if x86; then # Create a skeleton config.asm with just the ARCH_ definitions for FFmpeg. > "$TMPS" -echo "%define CONFIG_GPL" >> "$TMPS" -for part in $arch $subarch; do - part=$(echo $part | tr '[a-z]' '[A-Z]') - echo "%define ARCH_${part}" >> "$TMPS" -done +echo "%define CONFIG_GPL 1" >> "$TMPS" +echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS" +echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS" echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm