Index: source/libvpx/examples.mk |
=================================================================== |
--- source/libvpx/examples.mk (revision 278778) |
+++ source/libvpx/examples.mk (working copy) |
@@ -10,10 +10,24 @@ |
LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ |
third_party/libyuv/include/libyuv/cpu_id.h \ |
+ third_party/libyuv/include/libyuv/planar_functions.h \ |
+ third_party/libyuv/include/libyuv/row.h \ |
third_party/libyuv/include/libyuv/scale.h \ |
- third_party/libyuv/source/row.h \ |
- third_party/libyuv/source/scale.c \ |
- third_party/libyuv/source/cpu_id.c |
+ third_party/libyuv/include/libyuv/scale_row.h \ |
+ third_party/libyuv/source/cpu_id.cc \ |
+ third_party/libyuv/source/planar_functions.cc \ |
+ third_party/libyuv/source/row_any.cc \ |
+ third_party/libyuv/source/row_common.cc \ |
+ third_party/libyuv/source/row_mips.cc \ |
+ third_party/libyuv/source/row_neon.cc \ |
+ third_party/libyuv/source/row_posix.cc \ |
+ third_party/libyuv/source/row_win.cc \ |
+ third_party/libyuv/source/scale.cc \ |
+ third_party/libyuv/source/scale_common.cc \ |
+ third_party/libyuv/source/scale_mips.cc \ |
+ third_party/libyuv/source/scale_neon.cc \ |
+ third_party/libyuv/source/scale_posix.cc \ |
+ third_party/libyuv/source/scale_win.cc |
LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer.cpp \ |
third_party/libwebm/mkvmuxerutil.cpp \ |
@@ -42,7 +56,9 @@ |
vpxdec.SRCS += ivfdec.c ivfdec.h |
vpxdec.SRCS += tools_common.c tools_common.h |
vpxdec.SRCS += y4menc.c y4menc.h |
-vpxdec.SRCS += $(LIBYUV_SRCS) |
+ifeq ($(CONFIG_LIBYUV),yes) |
+ vpxdec.SRCS += $(LIBYUV_SRCS) |
+endif |
ifeq ($(CONFIG_WEBM_IO),yes) |
vpxdec.SRCS += $(LIBWEBM_PARSER_SRCS) |
vpxdec.SRCS += webmdec.cc webmdec.h |
@@ -60,22 +76,26 @@ |
vpxenc.SRCS += vpx_ports/mem_ops_aligned.h |
vpxenc.SRCS += vpx_ports/vpx_timer.h |
vpxenc.SRCS += vpxstats.c vpxstats.h |
-vpxenc.SRCS += $(LIBYUV_SRCS) |
+ifeq ($(CONFIG_LIBYUV),yes) |
+ vpxenc.SRCS += $(LIBYUV_SRCS) |
+endif |
ifeq ($(CONFIG_WEBM_IO),yes) |
vpxenc.SRCS += $(LIBWEBM_MUXER_SRCS) |
vpxenc.SRCS += webmenc.cc webmenc.h |
endif |
vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 |
vpxenc.DESCRIPTION = Full featured encoder |
-EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c |
-vp9_spatial_svc_encoder.SRCS += args.c args.h |
-vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h |
-vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h |
-vp9_spatial_svc_encoder.SRCS += video_common.h |
-vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c |
-vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h |
-vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D |
-vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder |
+ifeq ($(CONFIG_SPATIAL_SVC),yes) |
+ EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c |
+ vp9_spatial_svc_encoder.SRCS += args.c args.h |
+ vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h |
+ vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h |
+ vp9_spatial_svc_encoder.SRCS += video_common.h |
+ vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c |
+ vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h |
+ vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D |
+ vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder |
+endif |
ifneq ($(CONFIG_SHARED),yes) |
EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c |
@@ -158,11 +178,13 @@ |
ifeq ($(CONFIG_MULTI_RES_ENCODING),yes) |
+ifeq ($(CONFIG_LIBYUV),yes) |
EXAMPLES-$(CONFIG_VP8_DECODER) += vp8_multi_resolution_encoder.c |
vp8_multi_resolution_encoder.SRCS += $(LIBYUV_SRCS) |
vp8_multi_resolution_encoder.GUID = 04f8738e-63c8-423b-90fa-7c2703a374de |
vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding |
endif |
+endif |
# Handle extra library flags depending on codec configuration |
@@ -284,6 +306,7 @@ |
--name=$$(@:.$(VCPROJ_SFX)=)\ |
--ver=$$(CONFIG_VS_VERSION)\ |
--proj-guid=$$($$(@:.$(VCPROJ_SFX)=).GUID)\ |
+ --src-path-bare="$(SRC_PATH_BARE)" \ |
$$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \ |
--out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \ |
$$(INTERNAL_LDFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) $$^ |