diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:11:26 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:19:59 -0800 |
| commit | 879cb7d96259a71eea0038452a00241650589084 (patch) | |
| tree | 4d8c0a86fcdb6655d10647837e6c3adfb38639c4 /build/make/configure.sh | |
| parent | c14439c3d3db8dfa44a30c4edc50f56250ce4cd3 (diff) | |
| parent | bdca030cafc31446afc1685906f7c44e1850ed84 (diff) | |
| download | libvpx-879cb7d96259a71eea0038452a00241650589084.tar libvpx-879cb7d96259a71eea0038452a00241650589084.tar.gz libvpx-879cb7d96259a71eea0038452a00241650589084.tar.bz2 libvpx-879cb7d96259a71eea0038452a00241650589084.zip | |
Merge vp9-preview changes into experimental branch
Incorportate vp9-preview changes by merging master branch into experimental.
Conflicts:
test/test.mk
vp9/common/vp9_filter.c
vp9/common/vp9_idctllm.c
vp9/common/vp9_invtrans.h
vp9/common/vp9_mbpitch.c
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_systemdependent.h
vp9/common/vp9_type_aliases.h
vp9/common/x86/vp9_asm_stubs.c
vp9/common/x86/vp9_subpixel_mmx.asm
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_dequantize.c
vp9/decoder/vp9_dequantize.h
vp9/decoder/vp9_onyxd_int.h
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rdopt.c
Change-Id: I17f51c3666d1b59cf1a699f87607cbc5d30a87c5
Diffstat (limited to 'build/make/configure.sh')
| -rwxr-xr-x | build/make/configure.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 72627377c..318f0f760 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -277,6 +277,7 @@ clean_temp_files() { # Toolchain Check Functions # check_cmd() { + enabled external_build && return log "$@" "$@" >>${logfile} 2>&1 } @@ -767,6 +768,7 @@ process_common_toolchain() { ;; armv5te) soft_enable edsp + disable fast_unaligned ;; esac @@ -1000,7 +1002,11 @@ EOF soft_enable sse2 soft_enable sse3 soft_enable ssse3 - soft_enable sse4_1 + if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then + RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 " + else + soft_enable sse4_1 + fi case ${tgt_os} in win*) @@ -1175,9 +1181,6 @@ EOF ;; esac - # for sysconf(3) and friends. - check_header unistd.h - # glibc needs these if enabled linux; then add_cflags -D_LARGEFILE_SOURCE |