Index: generate_gypi.sh |
diff --git a/generate_gypi.sh b/generate_gypi.sh |
index c36fc1bb767e31a9e1c07645a81e30fd170ece08..5658245acc5c7b291bd7caa459c6223150f991d6 100755 |
--- a/generate_gypi.sh |
+++ b/generate_gypi.sh |
@@ -226,7 +226,6 @@ function convert_srcs_to_project_files { |
# Select all x86 files ending with .c |
local intrinsic_list=$(echo "$source_list" | \ |
- egrep 'vp[89]/(encoder|decoder|common)/x86/' | \ |
egrep '(mmx|sse2|sse3|ssse3|sse4|avx|avx2).c$') |
# Select all neon files ending in C but only when building in RTCD mode |
@@ -236,7 +235,7 @@ function convert_srcs_to_project_files { |
# they need the -mfpu=neon flag. |
# the pattern may need to be updated if vpx_scale gets intrinics |
local intrinsic_list=$(echo "$source_list" | \ |
- egrep 'vp[89]/(encoder|decoder|common)/arm/neon/.*(_neon\.c|\.asm)$') |
+ egrep 'neon.*(\.c|\.asm)$') |
fi |
# Remove these files from the main list. |
@@ -364,6 +363,13 @@ function gen_rtcd_header { |
$BASE_DIR/$LIBVPX_SRC_DIR/vpx_scale/vpx_scale_rtcd.pl \ |
> $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_scale_rtcd.h |
+ $BASE_DIR/$LIBVPX_SRC_DIR/build/make/rtcd.pl \ |
+ --arch=$2 \ |
+ --sym=vpx_dsp_rtcd \ |
+ --config=$BASE_DIR/$TEMP_DIR/libvpx.config \ |
+ $BASE_DIR/$LIBVPX_SRC_DIR/vpx_dsp/vpx_dsp_rtcd_defs.pl \ |
+ > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_dsp_rtcd.h |
+ |
rm -rf $BASE_DIR/$TEMP_DIR/libvpx.config |
} |
@@ -372,7 +378,7 @@ function gen_rtcd_header { |
# $1 - Header file directory. |
# $2 - Config command line. |
function gen_config_files { |
- ./configure $2 > /dev/null |
+ ./configure $2 > /dev/null |
# Disable HAVE_UNISTD_H as it causes vp8 to try to detect how many cpus |
# available, which doesn't work from iniside a sandbox on linux. |
@@ -406,8 +412,8 @@ gen_config_files linux/arm "--target=armv6-linux-gcc --enable-pic --enable-realt |
gen_config_files linux/arm-neon "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" |
gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --enable-runtime-cpu-detect --disable-edsp ${all_platforms}" |
gen_config_files linux/arm64 "--force-target=armv8-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" |
-gen_config_files linux/mipsel "--target=mips32-linux-gcc --disable-fast-unaligned ${all_platforms}" |
-gen_config_files linux/mips64el "--target=mips64-linux-gcc --disable-fast-unaligned ${all_platforms}" |
+gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}" |
+gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" |
gen_config_files linux/generic "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}" |
gen_config_files win/ia32 "--target=x86-win32-vs12 --enable-realtime-only ${all_platforms}" |
gen_config_files win/x64 "--target=x86_64-win64-vs12 --enable-realtime-only ${all_platforms}" |
@@ -527,5 +533,4 @@ echo "Remove temporary directory." |
cd $BASE_DIR |
rm -rf $TEMP_DIR |
-# TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel? |
# TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel? |