diff options
| author | Johann Koenig <johannkoenig@google.com> | 2015-08-31 17:46:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-31 17:46:20 +0000 |
| commit | 6a467ee711c07dcbf55b74d09c9369e5df97f93f (patch) | |
| tree | 7853b78a565c9b9a49a1137af00e5425e222e0bb | |
| parent | 08507eb82a61e7e77000c44fcfef302a4967ec2c (diff) | |
| parent | 0231e27bf0491baa6e8a4bb59d449ab61d2dd606 (diff) | |
| download | libvpx-6a467ee711c07dcbf55b74d09c9369e5df97f93f.tar libvpx-6a467ee711c07dcbf55b74d09c9369e5df97f93f.tar.gz libvpx-6a467ee711c07dcbf55b74d09c9369e5df97f93f.tar.bz2 libvpx-6a467ee711c07dcbf55b74d09c9369e5df97f93f.zip | |
Merge "Check CONFIG_VP<N> instead of encoder and decoder"
| -rw-r--r-- | libs.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes) CODEC_DOC_SECTIONS += vp8 vp8_decoder endif -ifneq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),) +ifeq ($(CONFIG_VP9),yes) VP9_PREFIX=vp9/ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk endif @@ -110,7 +110,7 @@ VP9_PREFIX=vp9/ $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra # VP10 make file -ifneq ($(CONFIG_VP10_ENCODER)$(CONFIG_VP10_DECODER),) +ifeq ($(CONFIG_VP10),yes) VP10_PREFIX=vp10/ include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk endif |