From 5b29d8de992e92d48959feb39ea0f306dca5dac4 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Thu, 19 Jan 2017 09:15:13 -0800 Subject: [PATCH] Fix cmake build. Add CONFIG_UNPOISON_PARTITION_CTX to cmake configuration. Also, remove deleted file from CMakeLists.txt. BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76 Change-Id: Ic26c19c0a12d638eebe94fd1eecda4a3e6c85bfc --- CMakeLists.txt | 1 - build/cmake/aom_config.h.cmake | 1 + build/cmake/aom_config_defaults.cmake | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10ebfc18b..a94a1eb05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,6 @@ set(AOM_DSP_SRCS "${AOM_ROOT}/aom_dsp/aom_dsp_rtcd.c" "${AOM_CONFIG_DIR}/aom_dsp_rtcd.h" "${AOM_ROOT}/aom_dsp/aom_filter.h" - "${AOM_ROOT}/aom_dsp/aom_simd.c" "${AOM_ROOT}/aom_dsp/aom_simd.h" "${AOM_ROOT}/aom_dsp/aom_simd_inline.h" "${AOM_ROOT}/aom_dsp/avg.c" diff --git a/build/cmake/aom_config.h.cmake b/build/cmake/aom_config.h.cmake index 377f7906d..6e8651b73 100644 --- a/build/cmake/aom_config.h.cmake +++ b/build/cmake/aom_config.h.cmake @@ -114,6 +114,7 @@ #define CONFIG_LOOP_RESTORATION ${CONFIG_LOOP_RESTORATION} #define CONFIG_EXT_PARTITION ${CONFIG_EXT_PARTITION} #define CONFIG_EXT_PARTITION_TYPES ${CONFIG_EXT_PARTITION_TYPES} +#define CONFIG_UNPOISON_PARTITION_CTX ${CONFIG_UNPOISON_PARTITION_CTX} #define CONFIG_EXT_TILE ${CONFIG_EXT_TILE} #define CONFIG_MOTION_VAR ${CONFIG_MOTION_VAR} #define CONFIG_WARPED_MOTION ${CONFIG_WARPED_MOTION} diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 0755b5755..50639eeb1 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake @@ -114,6 +114,7 @@ set(CONFIG_EC_MULTISYMBOL 1 CACHE BOOL "Internal flag.") set(CONFIG_LOOP_RESTORATION 0 CACHE BOOL "Internal flag.") set(CONFIG_EXT_PARTITION 0 CACHE BOOL "Internal flag.") set(CONFIG_EXT_PARTITION_TYPES 0 CACHE BOOL "Internal flag.") +set(CONFIG_UNPOISON_PARTITION_CTX 0 CACHE BOOL "Internal flag.") set(CONFIG_EXT_TILE 0 CACHE BOOL "Internal flag.") set(CONFIG_MOTION_VAR 0 CACHE BOOL "Internal flag.") set(CONFIG_WARPED_MOTION 0 CACHE BOOL "Internal flag.")