From 1106df1a054425ffd6d6a0351d10a66d5f82306c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 7 May 2024 08:50:40 +0200 Subject: [PATCH] deps: use clang gyp variable and enable -mssse3 on Windows too --- deps/zlib/zlib.gyp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index 26ceed9fbe6825..92e20b64b039ae 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -7,7 +7,6 @@ 'ZLIB_ROOT': '.', 'use_system_zlib%': 0, 'arm_fpu%': '', - 'llvm_version%': '0.0', }, 'conditions': [ ['use_system_zlib==0', { @@ -24,11 +23,16 @@ },{ 'defines': [ 'X86_NOT_WINDOWS' ], }], - ['OS!="win" or llvm_version!="0.0"', { + ['OS!="win" or clang==1', { 'cflags': [ '-mssse3' ], 'xcode_settings': { 'OTHER_CFLAGS': [ '-mssse3' ], }, + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ '-mssse3' ], + }, + }, }], ], }], @@ -65,7 +69,7 @@ 'conditions': [ ['OS!="ios"', { 'conditions': [ - ['OS!="win" and llvm_version=="0.0"', { + ['OS!="win" and clang==0', { 'cflags': [ '-march=armv8-a+aes+crc' ], }], ['OS=="android"', { @@ -111,7 +115,7 @@ # 'target_name': 'zlib_crc32_simd', # 'type': 'static_library', # 'conditions': [ - # ['OS!="win" or llvm_version!="0.0"', { + # ['OS!="win" or clang==1', { # 'cflags': [ # '-msse4.2', # '-mpclmul',