commit 963cacb9a06344848c907d5f14a9287a8daf18b4
author Tom Finegan <tomfinegan@google.com> Wed Apr 26 13:07:17 2017 -0700
committer James Zern <jzern@google.com> Thu Apr 27 06:28:47 2017 +0000
tree c3c4d8dfd17819508a47530bfedb8994cec1e406
parent 3d56e2690ea5845d2699cc837616e9bfb2d64837

Fix CMake build.

Needed sync since 3fcb356e78229809cbfa3867323f081ae4064ff0
added/deleted files.

Change-Id: I6b53b992eb7c9e30e91061f711672b15c4ca8c4b

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 5137e06..c1f7e89 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -52,7 +52,8 @@
     "${AOM_ROOT}/aom_dsp/x86/intrapred_ssse3.asm")
 
 set(AOM_DSP_COMMON_INTRIN_SSSE3
-    "${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c")
+    "${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c"
+    "${AOM_ROOT}/aom_dsp/x86/inv_txfm_ssse3.c")
 
 set(AOM_DSP_COMMON_INTRIN_SSE4_1
     "${AOM_ROOT}/aom_dsp/x86/blend_a64_hmask_sse4.c"
@@ -219,10 +220,6 @@
       ${AOM_DSP_COMMON_INTRIN_SSE2}
       "${AOM_ROOT}/aom_dsp/x86/inv_txfm_sse2.c"
       "${AOM_ROOT}/aom_dsp/x86/inv_txfm_sse2.h")
-
-  set(AOM_DSP_COMMON_ASM_SSSE3_X86_64
-      ${AOM_DSP_COMMON_ASM_SSSE3_X86_64}
-      "${AOM_ROOT}/aom_dsp/x86/inv_txfm_ssse3_x86_64.asm")
 endif ()
 
 if (CONFIG_DECODERS)
@@ -438,16 +435,11 @@
   endif ()
 
   if (HAVE_SSSE3)
-    if ("${AOM_TARGET_CPU}" STREQUAL "x86_64")
-      list(APPEND AOM_DSP_COMMON_ASM_SSSE3
-           ${AOM_DSP_COMMON_ASM_SSSE3_X86_64})
-    endif ()
-
     add_asm_library("aom_dsp_common_ssse3" "AOM_DSP_COMMON_ASM_SSSE3" "aom")
     add_intrinsics_object_library("-mssse3" "ssse3" "aom_dsp_common"
                                   "AOM_DSP_COMMON_INTRIN_SSSE3")
 
-     if (CONFIG_ENCODERS)
+    if (CONFIG_ENCODERS)
       if ("${AOM_TARGET_CPU}" STREQUAL "x86_64")
         list(APPEND AOM_DSP_ENCODER_ASM_SSSE3
              ${AOM_DSP_ENCODER_ASM_SSSE3_X86_64})