highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create config.asm for use with yasm

Browse Source 
Originally committed as revision 25039 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-09-03 21:27:19 +00:00
parent 0e5a7b9161
commit 55127e7b49
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.mak
View File

@ -36,6 +36,7 @@ ALLFFLIBS = avcodec avcore avdevice avfilter avformat avutil postproc swscale
IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH) IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS) CFLAGS += $(ECFLAGS)
YASMFLAGS += $(IFLAGS) -Pconfig.asm
HOSTCFLAGS += $(IFLAGS) HOSTCFLAGS += $(IFLAGS)

14
configure vendored
View File

@ -505,6 +505,10 @@ print_config_mak(){
echo "$v$2=yes" echo "$v$2=yes"
} }
print_config_asm(){
enabled $1 && echo "%define $2"
}
print_config(){ print_config(){
pfx=$1 pfx=$1
files=$2 files=$2
@ -1784,6 +1788,7 @@ tmpfile TMPO .o
tmpfile TMPS .S tmpfile TMPS .S
tmpfile TMPV .ver tmpfile TMPV .ver
tmpfile TMPSH .sh tmpfile TMPSH .sh
tmpfile TMPASM .asm
unset -f mktemp unset -f mktemp
@ -2578,7 +2583,7 @@ EOF
check_asm bswap '"bswap %%eax" ::: "%eax"' check_asm bswap '"bswap %%eax" ::: "%eax"'
YASMFLAGS="-f $objformat -DARCH_$(toupper $subarch)" YASMFLAGS="-f $objformat"
enabled x86_64 && append YASMFLAGS "-m amd64" enabled x86_64 && append YASMFLAGS "-m amd64"
enabled pic && append YASMFLAGS "-DPIC" enabled pic && append YASMFLAGS "-DPIC"
test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX" test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX"
@ -3184,6 +3189,11 @@ if enabled small || disabled optimizations; then
echo "#define av_always_inline" >> $TMPH echo "#define av_always_inline" >> $TMPH
fi fi
if enabled yasm; then
append config_files $TMPASM
printf '' >$TMPASM
fi
print_config ARCH_ "$config_files" $ARCH_LIST print_config ARCH_ "$config_files" $ARCH_LIST
print_config HAVE_ "$config_files" $HAVE_LIST print_config HAVE_ "$config_files" $HAVE_LIST
print_config CONFIG_ "$config_files" $CONFIG_LIST \ print_config CONFIG_ "$config_files" $CONFIG_LIST \
@ -3215,6 +3225,8 @@ echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
cp_if_changed $TMPH config.h cp_if_changed $TMPH config.h
touch .config touch .config
enabled yasm && cp_if_changed $TMPASM config.asm
cat > $TMPH <<EOF cat > $TMPH <<EOF
/* Generated by ffconf */ /* Generated by ffconf */
#ifndef AVUTIL_AVCONFIG_H #ifndef AVUTIL_AVCONFIG_H