Revision 55127e7b

View differences:

common.mak
36 36
IFLAGS   := -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
37 37
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
38 38
CFLAGS   += $(ECFLAGS)
39
YASMFLAGS += $(IFLAGS) -Pconfig.asm
39 40

  
40 41
HOSTCFLAGS += $(IFLAGS)
41 42

  
configure
505 505
    echo "$v$2=yes"
506 506
}
507 507

  
508
print_config_asm(){
509
    enabled $1 && echo "%define $2"
510
}
511

  
508 512
print_config(){
509 513
    pfx=$1
510 514
    files=$2
......
1784 1788
tmpfile TMPS  .S
1785 1789
tmpfile TMPV  .ver
1786 1790
tmpfile TMPSH .sh
1791
tmpfile TMPASM .asm
1787 1792

  
1788 1793
unset -f mktemp
1789 1794

  
......
2578 2583

  
2579 2584
    check_asm bswap '"bswap %%eax" ::: "%eax"'
2580 2585

  
2581
    YASMFLAGS="-f $objformat -DARCH_$(toupper $subarch)"
2586
    YASMFLAGS="-f $objformat"
2582 2587
    enabled     x86_64        && append YASMFLAGS "-m amd64"
2583 2588
    enabled     pic           && append YASMFLAGS "-DPIC"
2584 2589
    test -n "$extern_prefix"  && append YASMFLAGS "-DPREFIX"
......
3184 3189
    echo "#define av_always_inline"  >> $TMPH
3185 3190
fi
3186 3191

  
3192
if enabled yasm; then
3193
    append config_files $TMPASM
3194
    printf '' >$TMPASM
3195
fi
3196

  
3187 3197
print_config ARCH_   "$config_files" $ARCH_LIST
3188 3198
print_config HAVE_   "$config_files" $HAVE_LIST
3189 3199
print_config CONFIG_ "$config_files" $CONFIG_LIST       \
......
3215 3225
cp_if_changed $TMPH config.h
3216 3226
touch .config
3217 3227

  
3228
enabled yasm && cp_if_changed $TMPASM config.asm
3229

  
3218 3230
cat > $TMPH <<EOF
3219 3231
/* Generated by ffconf */
3220 3232
#ifndef AVUTIL_AVCONFIG_H

Also available in: Unified diff