7b8dfcb5a2
Creates a merge between the master and experimental branches. Fixes a number of conflicts in the build system to allow *either* VP8 or VP9 to be built. Specifically either: $ configure --disable-vp9 $ configure --disable-vp8 --disable-unit-tests VP9 still exports its symbols and files as VP8, so that will be resolved in the next commit. Unit tests are broken in VP9, but this isn't a new issue. They are fixed upstream on origin/experimental as of this writing, but rebasing this merge proved difficult, so will tackle that in a second merge commit. Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
66 lines
1.9 KiB
Makefile
66 lines
1.9 KiB
Makefile
##
|
|
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
##
|
|
## Use of this source code is governed by a BSD-style license
|
|
## that can be found in the LICENSE file in the root of the source
|
|
## tree. An additional intellectual property rights grant can be found
|
|
## in the file PATENTS. All contributing project authors may
|
|
## be found in the AUTHORS file in the root of the source tree.
|
|
##
|
|
|
|
|
|
VP8_DX_EXPORTS += exports_dec
|
|
|
|
VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes)
|
|
VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no)
|
|
VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes)
|
|
VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no)
|
|
|
|
VP8_DX_SRCS-yes += vp8_dx_iface.c
|
|
|
|
# common
|
|
#define ARM
|
|
#define DISABLE_THREAD
|
|
|
|
#INCLUDES += algo/vpx_common/vpx_mem/include
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += decoder
|
|
|
|
|
|
|
|
# decoder
|
|
#define ARM
|
|
#define DISABLE_THREAD
|
|
|
|
#INCLUDES += algo/vpx_common/vpx_mem/include
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += common
|
|
#INCLUDES += decoder
|
|
|
|
VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c
|
|
VP8_DX_SRCS-yes += decoder/dboolhuff.c
|
|
VP8_DX_SRCS-yes += decoder/decodemv.c
|
|
VP8_DX_SRCS-yes += decoder/decodframe.c
|
|
VP8_DX_SRCS-yes += decoder/detokenize.c
|
|
VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/ec_types.h
|
|
VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.h
|
|
VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.c
|
|
VP8_DX_SRCS-yes += decoder/dboolhuff.h
|
|
VP8_DX_SRCS-yes += decoder/decodemv.h
|
|
VP8_DX_SRCS-yes += decoder/decoderthreading.h
|
|
VP8_DX_SRCS-yes += decoder/detokenize.h
|
|
VP8_DX_SRCS-yes += decoder/onyxd_int.h
|
|
VP8_DX_SRCS-yes += decoder/treereader.h
|
|
VP8_DX_SRCS-yes += decoder/onyxd_if.c
|
|
VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c
|
|
|
|
VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes))
|
|
|
|
$(eval $(call asm_offsets_template,\
|
|
vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/asm_dec_offsets.c))
|