diff options
author | John Koleszar <jkoleszar@google.com> | 2011-01-31 09:10:35 -0500 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-01-31 09:10:35 -0500 |
commit | 933dfe0a94d41b7119c247506f9deeab7899da67 (patch) | |
tree | 3b8cee126b9d27b976ca126168d19eebbad850ca /configure | |
parent | a4c887da63131873a04b2af603efeb88b48b885e (diff) | |
parent | f3cb9ae459ab9c1883b7186eb10a6da0598716fc (diff) | |
download | libvpx-933dfe0a94d41b7119c247506f9deeab7899da67.tar libvpx-933dfe0a94d41b7119c247506f9deeab7899da67.tar.gz libvpx-933dfe0a94d41b7119c247506f9deeab7899da67.tar.bz2 libvpx-933dfe0a94d41b7119c247506f9deeab7899da67.zip |
Merge remote branch 'origin/master' into experimental
Conflicts:
configure
Change-Id: I18c2292256d2387ff09da209aa9cf6891e1864a0
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -79,11 +79,13 @@ EOF # alphabetically by architecture, generic-gnu last. all_platforms="${all_platforms} armv5te-linux-rvct" all_platforms="${all_platforms} armv5te-linux-gcc" +all_platforms="${all_platforms} armv5te-none-rvct" all_platforms="${all_platforms} armv5te-symbian-gcc" all_platforms="${all_platforms} armv5te-wince-vs8" all_platforms="${all_platforms} armv6-darwin-gcc" all_platforms="${all_platforms} armv6-linux-rvct" all_platforms="${all_platforms} armv6-linux-gcc" +all_platforms="${all_platforms} armv6-none-rvct" all_platforms="${all_platforms} armv6-symbian-gcc" all_platforms="${all_platforms} armv6-wince-vs8" all_platforms="${all_platforms} iwmmxt-linux-rvct" @@ -95,6 +97,7 @@ all_platforms="${all_platforms} iwmmxt2-wince-vs8" all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 +all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 all_platforms="${all_platforms} mips32-linux-gcc" all_platforms="${all_platforms} ppc32-darwin8-gcc" all_platforms="${all_platforms} ppc32-darwin9-gcc" @@ -159,6 +162,7 @@ enable fast_unaligned #allow unaligned accesses, if supported by hw enable md5 enable spatial_resampling enable multithread +enable os_support [ -d ${source_path}/../include ] && enable alt_tree_layout for d in vp8; do @@ -256,6 +260,7 @@ CONFIG_LIST=" small arm_asm_detok postproc_visualizer + os_support experimental ${EXPERIMENT_LIST} |