Create config.asm for use with yasm
Originally committed as revision 25039 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
0e5a7b9161
commit
55127e7b49
@ -36,6 +36,7 @@ ALLFFLIBS = avcodec avcore avdevice avfilter avformat avutil postproc swscale
|
||||
IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
|
||||
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
||||
CFLAGS += $(ECFLAGS)
|
||||
YASMFLAGS += $(IFLAGS) -Pconfig.asm
|
||||
|
||||
HOSTCFLAGS += $(IFLAGS)
|
||||
|
||||
|
14
configure
vendored
14
configure
vendored
@ -505,6 +505,10 @@ print_config_mak(){
|
||||
echo "$v$2=yes"
|
||||
}
|
||||
|
||||
print_config_asm(){
|
||||
enabled $1 && echo "%define $2"
|
||||
}
|
||||
|
||||
print_config(){
|
||||
pfx=$1
|
||||
files=$2
|
||||
@ -1784,6 +1788,7 @@ tmpfile TMPO .o
|
||||
tmpfile TMPS .S
|
||||
tmpfile TMPV .ver
|
||||
tmpfile TMPSH .sh
|
||||
tmpfile TMPASM .asm
|
||||
|
||||
unset -f mktemp
|
||||
|
||||
@ -2578,7 +2583,7 @@ EOF
|
||||
|
||||
check_asm bswap '"bswap %%eax" ::: "%eax"'
|
||||
|
||||
YASMFLAGS="-f $objformat -DARCH_$(toupper $subarch)"
|
||||
YASMFLAGS="-f $objformat"
|
||||
enabled x86_64 && append YASMFLAGS "-m amd64"
|
||||
enabled pic && append YASMFLAGS "-DPIC"
|
||||
test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX"
|
||||
@ -3184,6 +3189,11 @@ if enabled small || disabled optimizations; then
|
||||
echo "#define av_always_inline" >> $TMPH
|
||||
fi
|
||||
|
||||
if enabled yasm; then
|
||||
append config_files $TMPASM
|
||||
printf '' >$TMPASM
|
||||
fi
|
||||
|
||||
print_config ARCH_ "$config_files" $ARCH_LIST
|
||||
print_config HAVE_ "$config_files" $HAVE_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
|
||||
touch .config
|
||||
|
||||
enabled yasm && cp_if_changed $TMPASM config.asm
|
||||
|
||||
cat > $TMPH <<EOF
|
||||
/* Generated by ffconf */
|
||||
#ifndef AVUTIL_AVCONFIG_H
|
||||
|
Loading…
x
Reference in New Issue
Block a user