diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-14 08:10:35 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-14 14:44:47 -0700 |
| commit | 0ffa3836f3ce24596c2101d50c3ac51f79963f92 (patch) | |
| tree | 32dc663c7e2f4906a2786d65fe763ed1a7878332 /examples.mk | |
| parent | 1f08824d6db735e4cacb0419785a789395e42b2b (diff) | |
| download | libvpx-0ffa3836f3ce24596c2101d50c3ac51f79963f92.tar.gz libvpx-0ffa3836f3ce24596c2101d50c3ac51f79963f92.tar.bz2 libvpx-0ffa3836f3ce24596c2101d50c3ac51f79963f92.zip | |
Adding a configure flag to control WebM container support
Adding a --(enable|disable)-webm-io flag to control WebM container input and
output support. For now, enabling WebM IO by default only when there is a C++
compiler. Doing so because eventually we will move WebM IO to libwebm and it
is built using C++.
Change-Id: I210ac36c23528e382ed41d3c4322291720481492
Diffstat (limited to 'examples.mk')
| -rw-r--r-- | examples.mk | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/examples.mk b/examples.mk index 5c6e42d31..5f70300f9 100644 --- a/examples.mk +++ b/examples.mk @@ -26,16 +26,18 @@ vpxdec.SRCS += vpx/vpx_integer.h vpxdec.SRCS += args.c args.h vpxdec.SRCS += ivfdec.c ivfdec.h vpxdec.SRCS += tools_common.c tools_common.h -vpxdec.SRCS += webmdec.c webmdec.h vpxdec.SRCS += y4menc.c y4menc.h -vpxdec.SRCS += third_party/nestegg/halloc/halloc.h -vpxdec.SRCS += third_party/nestegg/halloc/src/align.h -vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c -vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h -vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h -vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h -vpxdec.SRCS += third_party/nestegg/src/nestegg.c vpxdec.SRCS += $(LIBYUV_SRCS) +ifeq ($(CONFIG_WEBM_IO),yes) + vpxdec.SRCS += third_party/nestegg/halloc/halloc.h + vpxdec.SRCS += third_party/nestegg/halloc/src/align.h + vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c + vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h + vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h + vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h + vpxdec.SRCS += third_party/nestegg/src/nestegg.c + vpxdec.SRCS += webmdec.c webmdec.h +endif vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 vpxdec.DESCRIPTION = Full featured decoder UTILS-$(CONFIG_ENCODERS) += vpxenc.c @@ -45,15 +47,17 @@ vpxenc.SRCS += ivfenc.c ivfenc.h vpxenc.SRCS += rate_hist.c rate_hist.h vpxenc.SRCS += tools_common.c tools_common.h vpxenc.SRCS += warnings.c warnings.h -vpxenc.SRCS += webmenc.c webmenc.h vpxenc.SRCS += vpx_ports/mem_ops.h vpxenc.SRCS += vpx_ports/mem_ops_aligned.h vpxenc.SRCS += vpx_ports/vpx_timer.h vpxenc.SRCS += vpxstats.c vpxstats.h -vpxenc.SRCS += third_party/libmkv/EbmlIDs.h -vpxenc.SRCS += third_party/libmkv/EbmlWriter.c -vpxenc.SRCS += third_party/libmkv/EbmlWriter.h vpxenc.SRCS += $(LIBYUV_SRCS) +ifeq ($(CONFIG_WEBM_IO),yes) + vpxenc.SRCS += third_party/libmkv/EbmlIDs.h + vpxenc.SRCS += third_party/libmkv/EbmlWriter.c + vpxenc.SRCS += third_party/libmkv/EbmlWriter.h + vpxenc.SRCS += webmenc.c webmenc.h +endif vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 vpxenc.DESCRIPTION = Full featured encoder EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_scalable_encoder.c |