generate_gypi.sh - Issue 866273003: Use the correct AVX flags for Windows builds

Unified Diff: generate_gypi.sh

Issue 866273003: Use the correct AVX flags for Windows builds (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

Index: generate_gypi.sh

diff --git a/generate_gypi.sh b/generate_gypi.sh

index c142206a74a69cae5c1d9aa86402ec967a3e0354..1428f2a60e59cb26a1ab78c5e3b28c67e48a67d4 100755

--- a/generate_gypi.sh

+++ b/generate_gypi.sh

@@ -123,11 +123,13 @@ function write_target_definition {

echo " 'EnableEnhancedInstructionSet': '3', # /arch:AVX" >> "$2"

Nico 2015/01/23 02:57:12 I think the problem here is that this unconditiona

Johann 2015/01/23 03:26:35 We only currently have avx2 code. We can switch th

Nico 2015/01/23 19:14:28 If this is only for avx2, then I'd change the stat

echo " }," >> "$2"

- elif [[ $4 == ssse3 || $4 == sse4.1 ]]; then

+ fi

+ if [[ $4 == ssse3 || $4 == sse4.1 || $4 == avx2 ]]; then

echo " 'conditions': [" >> "$2"

echo " ['OS==\"win\" and clang==1', {" >> "$2"

echo " # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe" >> "$2"

- echo " # doesn't need it for intrinsics. clang-cl does need it, though." >> "$2"

+ echo " # doesn't need it for intrinsics. There is an /arch flag for AVX2 but" >> "$2"

+ echo " # clang-cl needs its own in the form of -mOPT." >> "$2"

echo " 'msvs_settings': {" >> "$2"

echo " 'VCCLCompilerTool': { 'AdditionalOptions': [ '-m$4' ] }," >> "$2"

echo " }," >> "$2"

« no previous file with comments | « no previous file | libvpx_srcs_x86_64_intrinsics.gypi » ('j') | no next file with comments »