Index: source/libvpx/configure |
=================================================================== |
--- source/libvpx/configure (revision 263011) |
+++ source/libvpx/configure (working copy) |
@@ -51,6 +51,7 @@ |
${toggle_postproc_visualizer} macro block / block level visualizers |
${toggle_multi_res_encoding} enable multiple-resolution encoding |
${toggle_temporal_denoising} enable temporal denoising and disable the spatial denoiser |
+ ${toggle_webm_io} enable input from and output to WebM container |
Codecs: |
Codecs can be selectively enabled or disabled individually, or by family: |
@@ -160,6 +161,18 @@ |
[ -f ${source_path}/${t}.mk ] && enable_feature ${t} |
done |
+if ! perl --version >/dev/null; then |
+ die "Perl is required to build" |
+fi |
+ |
+ |
+if [ "`cd ${source_path} && pwd`" != "`pwd`" ]; then |
+ # test to see if source_path already configured |
+ if [ -f ${source_path}/vpx_config.h ]; then |
+ die "source directory already configured; run 'make distclean' there first" |
+ fi |
+fi |
+ |
# check installed doxygen version |
doxy_version=$(doxygen --version 2>/dev/null) |
doxy_major=${doxy_version%%.*} |
@@ -252,7 +265,6 @@ |
" |
EXPERIMENT_LIST=" |
multiple_arf |
- non420 |
alpha |
" |
CONFIG_LIST=" |
@@ -300,6 +312,7 @@ |
postproc_visualizer |
os_support |
unit_tests |
+ webm_io |
decode_perf_tests |
multi_res_encoding |
temporal_denoising |
@@ -353,6 +366,7 @@ |
small |
postproc_visualizer |
unit_tests |
+ webm_io |
decode_perf_tests |
multi_res_encoding |
temporal_denoising |
@@ -675,6 +689,7 @@ |
10|11|12) |
VCPROJ_SFX=vcxproj |
gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh |
+ enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror" |
;; |
esac |
all_targets="${all_targets} solution" |
@@ -689,6 +704,9 @@ |
enabled postproc || die "postproc_visualizer requires postproc to be enabled" |
fi |
+ # Enable WebM IO by default. |
+ soft_enable webm_io |
+ |
# Enable unit tests by default if we have a working C++ compiler. |
case "$toolchain" in |
*-vs*) |