Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: BUILD.gn

Issue 866273003: Use the correct AVX flags for Windows builds (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: elif Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | generate_gypi.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
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" ] 135 cflags = [ "/arch:AVX2" ]
136 } else { 136 } else {
137 cflags = [ "-mavx2" ] 137 cflags = [ "-mavx2" ]
138 } 138 }
139 if (cpu_arch == "x86") { 139 if (cpu_arch == "x86") {
140 sources = libvpx_srcs_x86_avx2 140 sources = libvpx_srcs_x86_avx2
141 } else if (cpu_arch == "x64") { 141 } else if (cpu_arch == "x64") {
142 sources = libvpx_srcs_x86_64_avx2 142 sources = libvpx_srcs_x86_64_avx2
143 } 143 }
144 } 144 }
145 145
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 if (is_android) { 245 if (is_android) {
246 deps += [ "//third_party/android_tools:cpu_features" ] 246 deps += [ "//third_party/android_tools:cpu_features" ]
247 } 247 }
248 if (cpu_arch == "arm") { 248 if (cpu_arch == "arm") {
249 deps += [ ":libvpx_assembly_arm" ] 249 deps += [ ":libvpx_assembly_arm" ]
250 } 250 }
251 251
252 public_configs = [ ":libvpx_external_config" ] 252 public_configs = [ ":libvpx_external_config" ]
253 } 253 }
OLDNEW
« no previous file with comments | « no previous file | generate_gypi.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698