diff options
author | Paul Wilkins <paulwilkins@google.com> | 2014-04-02 04:08:18 -0700 |
---|---|---|
committer | Paul Wilkins <paulwilkins@google.com> | 2014-04-02 13:29:25 +0100 |
commit | 80577dff4b409c30c7bb638a561787ec2c0a0210 (patch) | |
tree | bcf48d0212fcd68cca4a490ebb9f9a75c0f6aed1 /configure | |
parent | 88690475ea28fb396c8efb01ab6d21e106765341 (diff) | |
download | libvpx-80577dff4b409c30c7bb638a561787ec2c0a0210.tar libvpx-80577dff4b409c30c7bb638a561787ec2c0a0210.tar.gz libvpx-80577dff4b409c30c7bb638a561787ec2c0a0210.tar.bz2 libvpx-80577dff4b409c30c7bb638a561787ec2c0a0210.zip |
Revert "Changing webmenc to use libwebm"
Temporary revert.
Problems with conflicting definitions of type off_t
in MSVC builds that need resolving.
c:\Program Files (x86)\
Microsoft Visual Studio 9.0\VC\include\wchar.h(479) :
"error C2371: 'off_t' : redefinition; different basic types
c:\on2experimental\libvpx\tools_common.h(26) :
see declaration of 'off_t'"
This reverts commit 92a4c591122fa406a1d7aed834a5283a86d9758a.
Change-Id: I535e40a18842a92e3e6e0b29e5fba66313010803
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -704,11 +704,13 @@ process_toolchain() { 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*) soft_enable unit_tests - soft_enable webm_io ;; *-android-*) # GTestLog must be modified to use Android logging utilities. @@ -724,21 +726,13 @@ process_toolchain() { check_cxx "$@" <<EOF && soft_enable unit_tests int z; EOF - check_cxx "$@" <<EOF && soft_enable webm_io -int z; -EOF ;; *) enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests int z; EOF - check_cxx "$@" <<EOF && soft_enable webm_io -int z; -EOF ;; esac - # libwebm needs to be linked with C++ standard library - enabled webm_io && LD=${CXX} } |