From 5545a8983ff0ef1fb52e64aef8e66fa9b13c1cbb Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 7 Apr 2020 23:30:51 -0400 Subject: Move aom source to a sub-directory under media/libaom There is no damned reason to treat this differently than any other media lib given its license and there never was. --- third_party/aom/aom_scale/aom_scale.cmake | 38 ------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 third_party/aom/aom_scale/aom_scale.cmake (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake deleted file mode 100644 index 197dea6bd..000000000 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2017, Alliance for Open Media. All rights reserved -# -# This source code is subject to the terms of the BSD 2 Clause License and the -# Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License was -# not distributed with this source code in the LICENSE file, you can obtain it -# at www.aomedia.org/license/software. If the Alliance for Open Media Patent -# License 1.0 was not distributed with this source code in the PATENTS file, you -# can obtain it at www.aomedia.org/license/patent. -# -if(AOM_AOM_SCALE_AOM_SCALE_CMAKE_) - return() -endif() # AOM_AOM_SCALE_AOM_SCALE_CMAKE_ -set(AOM_AOM_SCALE_AOM_SCALE_CMAKE_ 1) - -list(APPEND AOM_SCALE_SOURCES "${AOM_ROOT}/aom_scale/aom_scale.h" - "${AOM_ROOT}/aom_scale/generic/aom_scale.c" - "${AOM_ROOT}/aom_scale/generic/gen_scalers.c" - "${AOM_ROOT}/aom_scale/generic/yv12config.c" - "${AOM_ROOT}/aom_scale/generic/yv12extend.c" - "${AOM_ROOT}/aom_scale/yv12config.h") - -list(APPEND AOM_SCALE_INTRIN_DSPR2 - "${AOM_ROOT}/aom_scale/mips/dspr2/yv12extend_dspr2.c") - -# Creates the aom_scale build target and makes libaom depend on it. The libaom -# target must exist before this function is called. -function(setup_aom_scale_targets) - add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES}) - target_sources(aom PRIVATE $) - - if(HAVE_DSPR2) - add_intrinsics_object_library("" "dspr2" "aom_scale" - "AOM_SCALE_INTRIN_DSPR2" "aom") - endif() - - set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) -endfunction() -- cgit v1.2.3