comparison configure @ 32796:48ffe13dd1ee

Fix compilation by adding defines necessary for ac3dsp to config.asm.
author cehoyos
date Fri, 11 Feb 2011 10:02:09 +0000
parents 5b3f37eab972
children 70765e0cd33b
comparison
equal deleted inserted replaced
32795:801dc49c6f33 32796:48ffe13dd1ee
8194 ############################################################################# 8194 #############################################################################
8195 8195
8196 ff_config_enable () { 8196 ff_config_enable () {
8197 list=$(echo $1 | tr '[a-z]' '[A-Z]') 8197 list=$(echo $1 | tr '[a-z]' '[A-Z]')
8198 item=$(echo $2 | tr '[a-z]' '[A-Z]') 8198 item=$(echo $2 | tr '[a-z]' '[A-Z]')
8199 _nprefix=$3; 8199 _nprefix=$4;
8200 _defineprefix=$3;
8200 test -z "$_nprefix" && _nprefix='CONFIG' 8201 test -z "$_nprefix" && _nprefix='CONFIG'
8201 for part in $list; do 8202 for part in $list; do
8202 if $(echo $item | grep -q -E "(^| )$part($| )"); then 8203 if $(echo $item | grep -q -E "(^| )$part($| )"); then
8203 echo "#define ${_nprefix}_$part 1" 8204 echo "${_defineprefix}define ${_nprefix}_$part 1"
8204 else 8205 else
8205 echo "#define ${_nprefix}_$part 0" 8206 echo "${_defineprefix}define ${_nprefix}_$part 0"
8206 fi 8207 fi
8207 done 8208 done
8208 } 8209 }
8209 8210
8210 echo "Creating config.h" 8211 echo "Creating config.h"
8344 /* CPU stuff */ 8345 /* CPU stuff */
8345 #define __CPU__ $iproc 8346 #define __CPU__ $iproc
8346 $def_ebx_available 8347 $def_ebx_available
8347 $def_words_endian 8348 $def_words_endian
8348 $def_bigendian 8349 $def_bigendian
8349 $(ff_config_enable "$arch_all" "$arch" "ARCH") 8350 $(ff_config_enable "$arch_all" "$arch" "#" "ARCH")
8350 $(ff_config_enable "$subarch_all" "$subarch" "ARCH") 8351 $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH")
8351 $(ff_config_enable "$cpuexts_all" "$cpuexts" "HAVE") 8352 $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE")
8352 8353
8353 8354
8354 /* Blu-ray/DVD/VCD/CD */ 8355 /* Blu-ray/DVD/VCD/CD */
8355 #define DEFAULT_CDROM_DEVICE "$default_cdrom_device" 8356 #define DEFAULT_CDROM_DEVICE "$default_cdrom_device"
8356 #define DEFAULT_DVD_DEVICE "$default_dvd_device" 8357 #define DEFAULT_DVD_DEVICE "$default_dvd_device"
8682 $def_libschroedinger_lavc 8683 $def_libschroedinger_lavc
8683 $def_mp3lame_lavc 8684 $def_mp3lame_lavc
8684 $def_x264_lavc 8685 $def_x264_lavc
8685 $def_xvid_lavc 8686 $def_xvid_lavc
8686 8687
8687 $(ff_config_enable "$libavdecoders_all" "$libavdecoders") 8688 $(ff_config_enable "$libavdecoders_all" "$libavdecoders" "#")
8688 $(ff_config_enable "$libavencoders_all" "$libavencoders") 8689 $(ff_config_enable "$libavencoders_all" "$libavencoders" "#")
8689 $(ff_config_enable "$libavparsers_all" "$libavparsers") 8690 $(ff_config_enable "$libavparsers_all" "$libavparsers" "#")
8690 $(ff_config_enable "$libavdemuxers_all" "$libavdemuxers") 8691 $(ff_config_enable "$libavdemuxers_all" "$libavdemuxers" "#")
8691 $(ff_config_enable "$libavmuxers_all" "$libavmuxers") 8692 $(ff_config_enable "$libavmuxers_all" "$libavmuxers" "#")
8692 $(ff_config_enable "$libavprotocols_all" "$libavprotocols") 8693 $(ff_config_enable "$libavprotocols_all" "$libavprotocols" "#")
8693 $(ff_config_enable "$libavbsfs_all" "$libavbsfs") 8694 $(ff_config_enable "$libavbsfs_all" "$libavbsfs" "#")
8694 $(ff_config_enable "$libavhwaccels_all" "$libavhwaccels") 8695 $(ff_config_enable "$libavhwaccels_all" "$libavhwaccels" "#")
8695 8696
8696 #endif /* MPLAYER_CONFIG_H */ 8697 #endif /* MPLAYER_CONFIG_H */
8697 EOF 8698 EOF
8698 8699
8699 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. 8700 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
8721 echo "%define CONFIG_GPL" >> "$TMPS" 8722 echo "%define CONFIG_GPL" >> "$TMPS"
8722 for part in $arch $subarch; do 8723 for part in $arch $subarch; do
8723 part=$(echo $part | tr '[a-z]' '[A-Z]') 8724 part=$(echo $part | tr '[a-z]' '[A-Z]')
8724 echo "%define ARCH_${part}" >> "$TMPS" 8725 echo "%define ARCH_${part}" >> "$TMPS"
8725 done 8726 done
8727 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS"
8726 8728
8727 cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm 8729 cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm
8728 fi 8730 fi
8729 8731
8730 8732