Skip to content

Commit a0ba0e0

Browse files
committed
deps: use clang gyp variable and enable -mssse3 on Windows too
1 parent 57b44a5 commit a0ba0e0

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

deps/zlib/zlib.gyp

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
'ZLIB_ROOT': '.',
88
'use_system_zlib%': 0,
99
'arm_fpu%': '',
10-
'llvm_version%': '0.0',
1110
},
1211
'conditions': [
1312
['use_system_zlib==0', {
@@ -24,11 +23,16 @@
2423
},{
2524
'defines': [ 'X86_NOT_WINDOWS' ],
2625
}],
27-
['OS!="win" or llvm_version!="0.0"', {
26+
['clang==1', {
2827
'cflags': [ '-mssse3' ],
2928
'xcode_settings': {
3029
'OTHER_CFLAGS': [ '-mssse3' ],
3130
},
31+
'msvs_settings': {
32+
'VCCLCompilerTool': {
33+
'AdditionalOptions': [ '-mssse3' ],
34+
},
35+
},
3236
}],
3337
],
3438
}],
@@ -65,7 +69,7 @@
6569
'conditions': [
6670
['OS!="ios"', {
6771
'conditions': [
68-
['OS!="win" and llvm_version=="0.0"', {
72+
['OS!="win" and clang==1', {
6973
'cflags': [ '-march=armv8-a+aes+crc' ],
7074
}],
7175
['OS=="android"', {
@@ -111,7 +115,7 @@
111115
# 'target_name': 'zlib_crc32_simd',
112116
# 'type': 'static_library',
113117
# 'conditions': [
114-
# ['OS!="win" or llvm_version!="0.0"', {
118+
# ['OS!="win" or clang==1', {
115119
# 'cflags': [
116120
# '-msse4.2',
117121
# '-mpclmul',

0 commit comments

Comments
 (0)