Mercurial > mplayer.hg

comparison configure @ 34971:7e818f6eadd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add HAVE_CPUNOP yasm define.
author reimar
date Wed, 08 Aug 2012 05:55:05 +0000
parents c77eb6f184a2
children 69eda178551e
comparison
equal deleted inserted replaced
34970:78bf01276896 34971:7e818f6eadd8
2775 else 2775 else
2776 warn_cflags=yes 2776 warn_cflags=yes
2777 fi 2777 fi
2778 2778
2779 echo "pextrd [eax], xmm0, 1" > $TMPS 2779 echo "pextrd [eax], xmm0, 1" > $TMPS
2780 yasm_features_all="cpunop"
2780 if test "$_yasm" ; then 2781 if test "$_yasm" ; then
2781 if ! yasm_check ; then 2782 if ! yasm_check ; then
2782 if x86_64 ; then 2783 if x86_64 ; then
2783 case "$objformat" in 2784 case "$objformat" in
2784 elf) objformat=elf64 ;; 2785 elf) objformat=elf64 ;;
2785 win32) objformat=win64 ;; 2786 win32) objformat=win64 ;;
2786 esac 2787 esac
2787 fi 2788 fi
2788 YASMFLAGS="-f $objformat $yasmdefines" 2789 YASMFLAGS="-f $objformat $yasmdefines"
2789 yasm_check || die "yasm not found, use --yasm='' if you really want to compile without" 2790 yasm_check || die "yasm not found, use --yasm='' if you really want to compile without"
2791 echo "CPU amdnop" > $TMPS
2792 yasm_check && yasm_features="cpunop"
2790 fi 2793 fi
2791 fi 2794 fi
2792 if test $_yasm ; then 2795 if test $_yasm ; then
2793 def_yasm='#define HAVE_YASM 1' 2796 def_yasm='#define HAVE_YASM 1'
2794 have_yasm="yes" 2797 have_yasm="yes"
8889 > "$TMPS" 8892 > "$TMPS"
8890 echo "%define CONFIG_GPL 1" >> "$TMPS" 8893 echo "%define CONFIG_GPL 1" >> "$TMPS"
8891 echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS" 8894 echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS"
8892 echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS" 8895 echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS"
8893 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" 8896 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS"
8897 echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS"
8894 8898
8895 cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm 8899 cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm
8896 fi 8900 fi
8897 8901
8898 8902