| OLD | NEW |
| 1 ## | 1 ## |
| 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 ## | 3 ## |
| 4 ## Use of this source code is governed by a BSD-style license | 4 ## Use of this source code is governed by a BSD-style license |
| 5 ## that can be found in the LICENSE file in the root of the source | 5 ## that can be found in the LICENSE file in the root of the source |
| 6 ## tree. An additional intellectual property rights grant can be found | 6 ## tree. An additional intellectual property rights grant can be found |
| 7 ## in the file PATENTS. All contributing project authors may | 7 ## in the file PATENTS. All contributing project authors may |
| 8 ## be found in the AUTHORS file in the root of the source tree. | 8 ## be found in the AUTHORS file in the root of the source tree. |
| 9 ## | 9 ## |
| 10 | 10 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk | 115 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk |
| 116 endif | 116 endif |
| 117 | 117 |
| 118 ifeq ($(CONFIG_VP9_ENCODER),yes) | 118 ifeq ($(CONFIG_VP9_ENCODER),yes) |
| 119 VP9_PREFIX=vp9/ | 119 VP9_PREFIX=vp9/ |
| 120 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk | 120 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk |
| 121 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) | 121 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) |
| 122 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) | 122 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) |
| 123 CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h | 123 CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h |
| 124 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h | 124 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h |
| 125 INSTALL-LIBS-yes += include/vpx/svc_context.h |
| 125 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% | 126 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% |
| 126 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h | 127 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h |
| 127 CODEC_DOC_SECTIONS += vp9 vp9_encoder | 128 CODEC_DOC_SECTIONS += vp9 vp9_encoder |
| 128 endif | 129 endif |
| 129 | 130 |
| 130 ifeq ($(CONFIG_VP9_DECODER),yes) | 131 ifeq ($(CONFIG_VP9_DECODER),yes) |
| 131 VP9_PREFIX=vp9/ | 132 VP9_PREFIX=vp9/ |
| 132 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk | 133 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk |
| 133 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) | 134 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) |
| 134 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) | 135 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c | 176 INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c |
| 176 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) | 177 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) |
| 177 CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm | 178 CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm |
| 178 endif | 179 endif |
| 179 CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com | 180 CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com |
| 180 CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc | 181 CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc |
| 181 CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec | 182 CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec |
| 182 | 183 |
| 183 INSTALL-LIBS-yes += include/vpx/vpx_codec.h | 184 INSTALL-LIBS-yes += include/vpx/vpx_codec.h |
| 184 INSTALL-LIBS-yes += include/vpx/vpx_image.h | 185 INSTALL-LIBS-yes += include/vpx/vpx_image.h |
| 186 INSTALL-LIBS-yes += include/vpx/vpx_external_frame_buffer.h |
| 185 INSTALL-LIBS-yes += include/vpx/vpx_integer.h | 187 INSTALL-LIBS-yes += include/vpx/vpx_integer.h |
| 186 INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h | 188 INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h |
| 187 INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h | 189 INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h |
| 188 ifeq ($(CONFIG_EXTERNAL_BUILD),yes) | 190 ifeq ($(CONFIG_EXTERNAL_BUILD),yes) |
| 189 ifeq ($(CONFIG_MSVS),yes) | 191 ifeq ($(CONFIG_MSVS),yes) |
| 190 INSTALL-LIBS-yes += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(
p)/$(CODEC_LIB).lib) | 192 INSTALL-LIBS-yes += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(
p)/$(CODEC_LIB).lib) |
| 191 INSTALL-LIBS-$(CONFIG_DEBUG_LIBS) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(
p)/$(CODEC_LIB)d.lib) | 193 INSTALL-LIBS-$(CONFIG_DEBUG_LIBS) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(
p)/$(CODEC_LIB)d.lib) |
| 192 INSTALL-LIBS-$(CONFIG_SHARED) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/v
px.dll) | 194 INSTALL-LIBS-$(CONFIG_SHARED) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/v
px.dll) |
| 193 INSTALL-LIBS-$(CONFIG_SHARED) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/v
px.exp) | 195 INSTALL-LIBS-$(CONFIG_SHARED) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/v
px.exp) |
| 194 endif | 196 endif |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 @echo "INPUT += $^" >> $@ | 518 @echo "INPUT += $^" >> $@ |
| 517 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ | 519 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ |
| 518 @echo "INCLUDE_PATH += ." >> $@; | 520 @echo "INCLUDE_PATH += ." >> $@; |
| 519 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ | 521 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ |
| 520 | 522 |
| 521 ## Generate rtcd.h for all objects | 523 ## Generate rtcd.h for all objects |
| 522 $(OBJS-yes:.o=.d): $(RTCD) | 524 $(OBJS-yes:.o=.d): $(RTCD) |
| 523 | 525 |
| 524 ## Update the global src list | 526 ## Update the global src list |
| 525 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) | 527 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) |
| OLD | NEW |