| Index: generate_gypi.sh
|
| diff --git a/generate_gypi.sh b/generate_gypi.sh
|
| index 6c9fde19d7b34c55764386f195fe6da86db75dfe..c142206a74a69cae5c1d9aa86402ec967a3e0354 100755
|
| --- a/generate_gypi.sh
|
| +++ b/generate_gypi.sh
|
| @@ -188,9 +188,7 @@ function write_intrinsics_gypi {
|
| exit 1
|
| fi
|
| if [ 0 -ne ${#avx2_sources} ]; then
|
| - #write_target_definition avx2_sources[@] "$2" libvpx_intrinsics_avx2 avx2
|
| - echo "ERROR: Uncomment avx2 sections in libvpx.gyp"
|
| - exit 1
|
| + write_target_definition avx2_sources[@] "$2" libvpx_intrinsics_avx2 avx2
|
| fi
|
|
|
| # arm neon
|
| @@ -343,7 +341,6 @@ function gen_rtcd_header {
|
| --arch=$2 \
|
| --sym=vp8_rtcd \
|
| --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
|
| - --disable-avx2 \
|
| $BASE_DIR/$LIBVPX_SRC_DIR/vp8/common/rtcd_defs.pl \
|
| > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp8_rtcd.h
|
|
|
| @@ -351,7 +348,6 @@ function gen_rtcd_header {
|
| --arch=$2 \
|
| --sym=vp9_rtcd \
|
| --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
|
| - --disable-avx2 \
|
| $BASE_DIR/$LIBVPX_SRC_DIR/vp9/common/vp9_rtcd_defs.pl \
|
| > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp9_rtcd.h
|
|
|
| @@ -359,7 +355,6 @@ function gen_rtcd_header {
|
| --arch=$2 \
|
| --sym=vpx_scale_rtcd \
|
| --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
|
| - --disable-avx2 \
|
| $BASE_DIR/$LIBVPX_SRC_DIR/vpx_scale/vpx_scale_rtcd.pl \
|
| > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_scale_rtcd.h
|
|
|
| @@ -395,7 +390,7 @@ cd $TEMP_DIR
|
|
|
| echo "Generate config files."
|
| # TODO(joeyparrish) Enable AVX2 when broader VS2013 support is available
|
| -all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --disable-avx2 --enable-vp9-temporal-denoising"
|
| +all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --enable-vp9-temporal-denoising"
|
| gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}"
|
| gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}"
|
| gen_config_files linux/arm "--target=armv6-linux-gcc --enable-pic --enable-realtime-only --disable-install-bins --disable-install-libs --disable-edsp ${all_platforms}"
|
|
|