windows issue wip

nodejs · Jul 10, 2022 · eed8c55 · eed8c55
1 parent 08a1c76
commit eed8c55
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/deps/base64/base64.gyp b/deps/base64/base64.gyp
@@ -10,7 +10,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'direct_dependent_settings': {
         'include_dirs': [ 'base64/include' ],
+        'defines': [ 'BASE64_STATIC_DEFINE' ],
       },
+      'defines': [ 'BASE64_STATIC_DEFINE' ],
       'sources': [
         'base64/include/libbase64.h',
         'base64/lib/arch/generic/codec.c',
@@ -69,7 +71,7 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/ssse3/codec.c' ],
-      'defines': [ 'HAVE_SSSE3=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSSE3=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-mssse3' ],
@@ -85,7 +87,7 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/sse41/codec.c' ],
-      'defines': [ 'HAVE_SSE41=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE41=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-msse4.1' ],
@@ -101,7 +103,7 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/sse42/codec.c' ],
-      'defines': [ 'HAVE_SSE42=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE42=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-msse4.2' ],
@@ -117,13 +119,21 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/avx/codec.c' ],
-      'defines': [ 'HAVE_AVX=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-mavx' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mavx' ]
           },
+        }, {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [
+                '/arch:AVX'
+              ],
+            },
+          },
         }],
       ],
     },
@@ -133,13 +143,21 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/avx2/codec.c' ],
-      'defines': [ 'HAVE_AVX2=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX2=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-mavx2' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mavx2' ]
           },
+        }, {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [
+                '/arch:AVX2'
+              ],
+            },
+          },
         }],
       ],
     },
@@ -149,7 +167,7 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/neon32/codec.c' ],
-      'defines': [ 'HAVE_NEON32=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_NEON32=1' ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags': [ '-mfpu=neon' ],
@@ -165,7 +183,7 @@
       'type': 'static_library',
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/neon64/codec.c' ],
-      'defines': [ 'HAVE_NEON64=1' ],
+      'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_NEON64=1' ],
       # NEON is required in arm64, so no -mfpu flag is needed
     }