Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/arm.gni") | 5 import("//build/config/arm.gni") |
| 6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
| 7 import("//third_party/libvpx/libvpx_srcs.gni") | 7 import("//third_party/libvpx/libvpx_srcs.gni") |
| 8 import("//third_party/yasm/yasm_assemble.gni") | 8 import("//third_party/yasm/yasm_assemble.gni") |
| 9 | 9 |
| 10 if (is_posix && !is_mac) { | 10 if (is_posix && !is_mac) { |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 sources = libvpx_srcs_x86_sse4_1 | 124 sources = libvpx_srcs_x86_sse4_1 |
| 125 } else if (cpu_arch == "x64") { | 125 } else if (cpu_arch == "x64") { |
| 126 sources = libvpx_srcs_x86_64_sse4_1 | 126 sources = libvpx_srcs_x86_64_sse4_1 |
| 127 } | 127 } |
| 128 } | 128 } |
| 129 | 129 |
| 130 static_library("libvpx_intrinsics_avx2") { | 130 static_library("libvpx_intrinsics_avx2") { |
| 131 configs += [ ":libvpx_config" ] | 131 configs += [ ":libvpx_config" ] |
| 132 configs -= [ "//build/config/compiler:chromium_code" ] | 132 configs -= [ "//build/config/compiler:chromium_code" ] |
| 133 configs += [ "//build/config/compiler:no_chromium_code" ] | 133 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 134 if (!is_win) { | 134 if (is_win) { |
| 135 cflags = [ "/arch:AVX" ] | |
|
Tom Finegan
2015/01/22 18:43:49
msdn vs2013 docs[1] say both are supported. I thin
| |
| 136 } else { | |
| 135 cflags = [ "-mavx2" ] | 137 cflags = [ "-mavx2" ] |
| 136 } | 138 } |
| 137 if (cpu_arch == "x86") { | 139 if (cpu_arch == "x86") { |
| 138 sources = libvpx_srcs_x86_avx2 | 140 sources = libvpx_srcs_x86_avx2 |
| 139 } else if (cpu_arch == "x64") { | 141 } else if (cpu_arch == "x64") { |
| 140 sources = libvpx_srcs_x86_64_avx2 | 142 sources = libvpx_srcs_x86_64_avx2 |
| 141 } | 143 } |
| 142 } | 144 } |
| 143 | 145 |
| 144 if (cpu_arch_full == "arm-neon-cpu-detect") { | 146 if (cpu_arch_full == "arm-neon-cpu-detect") { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 } | 244 } |
| 243 if (is_android) { | 245 if (is_android) { |
| 244 deps += [ "//third_party/android_tools:cpu_features" ] | 246 deps += [ "//third_party/android_tools:cpu_features" ] |
| 245 } | 247 } |
| 246 if (cpu_arch == "arm") { | 248 if (cpu_arch == "arm") { |
| 247 deps += [ ":libvpx_assembly_arm" ] | 249 deps += [ ":libvpx_assembly_arm" ] |
| 248 } | 250 } |
| 249 | 251 |
| 250 public_configs = [ ":libvpx_external_config" ] | 252 public_configs = [ ":libvpx_external_config" ] |
| 251 } | 253 } |
| OLD | NEW |