Commit 2ca19f90 authored by Tom Finegan's avatar Tom Finegan

cmake: Silence ranlib warnings when jnt_comp is disabled.

Build aom_dsp/x86/variance_ssse3.c and
av1/common/x86/convolve_2d_sse4.c only when jnt_comp is enabled.

When jnt_comp is disabled the sources define no symbols and
ranlib complains.

Change-Id: I3de42be6a88bd65459799d3a523e307c40a36a72
parent 97fc474c
......@@ -59,8 +59,13 @@ set(AOM_DSP_COMMON_ASM_SSSE3
set(AOM_DSP_COMMON_INTRIN_SSSE3
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/intrapred_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/inv_txfm_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/variance_ssse3.c")
"${AOM_ROOT}/aom_dsp/x86/inv_txfm_ssse3.c")
if (CONFIG_JNT_COMP)
set(AOM_DSP_COMMON_INTRIN_SSSE3
${AOM_DSP_COMMON_INTRIN_SSSE3}
"${AOM_ROOT}/aom_dsp/x86/variance_ssse3.c")
endif ()
set(AOM_DSP_COMMON_INTRIN_SSE4_1
"${AOM_ROOT}/aom_dsp/x86/blend_a64_hmask_sse4.c"
......
......@@ -288,15 +288,19 @@ if (CONFIG_CONVOLVE_ROUND)
set(AOM_AV1_COMMON_INTRIN_SSE2
${AOM_AV1_COMMON_INTRIN_SSE2}
"${AOM_ROOT}/av1/common/x86/convolve_2d_sse2.c")
set(AOM_AV1_COMMON_INTRIN_SSE4_1
${AOM_AV1_COMMON_INTRIN_SSE4_1}
"${AOM_ROOT}/av1/common/x86/convolve_2d_sse4.c")
if (CONFIG_HIGHBITDEPTH)
set(AOM_AV1_COMMON_INTRIN_SSSE3
${AOM_AV1_COMMON_INTRIN_SSSE3}
"${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_ssse3.c")
endif ()
if (CONFIG_JNT_COMP)
set(AOM_AV1_COMMON_INTRIN_SSE4_1
${AOM_AV1_COMMON_INTRIN_SSE4_1}
"${AOM_ROOT}/av1/common/x86/convolve_2d_sse4.c")
endif ()
if(NOT CONFIG_COMPOUND_ROUND)
set(AOM_AV1_COMMON_INTRIN_SSE4_1
${AOM_AV1_COMMON_INTRIN_SSE4_1}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment