diff options
| -rwxr-xr-x | build/make/configure.sh | 9 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | examples.mk | 1 | ||||
| -rw-r--r-- | vpx/vpx_codec.mk | 12 |
4 files changed, 15 insertions, 9 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 51878864a..4ffef0187 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -458,9 +458,12 @@ process_common_cmdline() { eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` if echo "${ARCH_EXT_LIST}" | grep "^ *$option\$" >/dev/null; then [ $action = "disable" ] && RTCD_OPTIONS="${RTCD_OPTIONS}${opt} " - else - echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || - die_unknown $opt + elif [ $action = "disable" ] && ! disabled $option ; then + echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || + die_unknown $opt + elif [ $action = "enable" ] && ! enabled $option ; then + echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || + die_unknown $opt fi $action $option ;; @@ -180,6 +180,8 @@ else # customer environment [ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp8_encoder" [ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder" +[ -f ${source_path}/../include/vpx/vp8cx.h ] || disable vp8_encoder +[ -f ${source_path}/../include/vpx/vp8dx.h ] || disable vp8_decoder [ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt fi diff --git a/examples.mk b/examples.mk index 518608d72..b93a16b1f 100644 --- a/examples.mk +++ b/examples.mk @@ -32,6 +32,7 @@ vpxenc.SRCS += args.c args.h y4minput.c y4minput.h vpxenc.SRCS += tools_common.c tools_common.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 += libmkv/EbmlIDs.h vpxenc.SRCS += libmkv/EbmlWriter.c vpxenc.SRCS += libmkv/EbmlWriter.h diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk index 4f1d74bd4..f2500ba00 100644 --- a/vpx/vpx_codec.mk +++ b/vpx/vpx_codec.mk @@ -11,12 +11,12 @@ API_EXPORTS += exports -API_SRCS-$(CONFIG_DECODERS) += src/vpx_decoder.c -API_SRCS-$(CONFIG_DECODERS) += src/vpx_decoder_compat.c -API_SRCS-$(CONFIG_DECODERS) += vpx_decoder.h -API_SRCS-$(CONFIG_DECODERS) += vpx_decoder_compat.h -API_SRCS-$(CONFIG_ENCODERS) += src/vpx_encoder.c -API_SRCS-$(CONFIG_ENCODERS) += vpx_encoder.h +API_SRCS-yes += src/vpx_decoder.c +API_SRCS-yes += src/vpx_decoder_compat.c +API_SRCS-yes += vpx_decoder.h +API_SRCS-yes += vpx_decoder_compat.h +API_SRCS-yes += src/vpx_encoder.c +API_SRCS-yes += vpx_encoder.h API_SRCS-yes += internal/vpx_codec_internal.h API_SRCS-yes += src/vpx_codec.c API_SRCS-yes += src/vpx_image.c |