comparison configure @ 34547:3bc6555139cd

Update config.asm generation to work with latest FFmpeg.
author reimar
date Sat, 28 Jan 2012 14:00:07 +0000
parents e421fb9bb0b9
children 8ae9ca41186d
comparison
equal deleted inserted replaced
34546:123345d17f3a 34547:3bc6555139cd
2935 inline_asm_check '"wunpckelub wr6, wr4"' && _iwmmxt=yes 2935 inline_asm_check '"wunpckelub wr6, wr4"' && _iwmmxt=yes
2936 fi 2936 fi
2937 echores "$_iwmmxt" 2937 echores "$_iwmmxt"
2938 fi 2938 fi
2939 2939
2940 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' 2940 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'
2941 test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" 2941 test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts"
2942 test "$_mmx" = yes && cpuexts="MMX $cpuexts" 2942 test "$_mmx" = yes && cpuexts="MMX $cpuexts"
2943 test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" 2943 test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"
2944 test "$_3dnow" = yes && cpuexts="AMD3DNOW $cpuexts" 2944 test "$_3dnow" = yes && cpuexts="AMD3DNOW $cpuexts"
2945 test "$_3dnowext" = yes && cpuexts="AMD3DNOWEXT $cpuexts" 2945 test "$_3dnowext" = yes && cpuexts="AMD3DNOWEXT $cpuexts"
8784 8784
8785 8785
8786 if x86; then 8786 if x86; then
8787 # Create a skeleton config.asm with just the ARCH_ definitions for FFmpeg. 8787 # Create a skeleton config.asm with just the ARCH_ definitions for FFmpeg.
8788 > "$TMPS" 8788 > "$TMPS"
8789 echo "%define CONFIG_GPL" >> "$TMPS" 8789 echo "%define CONFIG_GPL 1" >> "$TMPS"
8790 for part in $arch $subarch; do 8790 echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS"
8791 part=$(echo $part | tr '[a-z]' '[A-Z]') 8791 echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS"
8792 echo "%define ARCH_${part}" >> "$TMPS"
8793 done
8794 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" 8792 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS"
8795 8793
8796 cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm 8794 cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm
8797 fi 8795 fi
8798 8796