big changes

Author: baileympearson

binding.gyp

@@ -17,49 +17,45 @@
       'addon/compression.h',
       'addon/compression.cpp'
     ],
-    'xcode_settings': {
-      'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-      'CLANG_CXX_LIBRARY': 'libc++',
-      'MACOSX_DEPLOYMENT_TARGET': '11',
-      'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
-      'OTHER_CFLAGS': [
-          '-std=c++17',
-          '-stdlib=libc++'
-        ],
-    },
     'conditions': [
         [
           'OS=="win"',
           {
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'ExceptionHandling': 1,
-                'AdditionalOptions': [
-                  '-std:c++17'
-                ]
-              }
-            },
-            'include_dirs': [
-              '<(module_root_dir)/deps/include'
-            ],
             'link_settings': {
               'libraries': [
-                '<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.lib'
+                '<(module_root_dir)/deps/zstd/build/cmake/lib/Debug/zstd_static.lib'
+              ]
+            },
+          },
+          { # macos and linux
+          'link_settings': {
+            'libraries': [
+              '<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.a',
               ]
-            }
+            },
           }
         ]
       ],
     'cflags!': [ '-fno-exceptions' ],
     'cflags_cc!': [ '-fno-exceptions' ],
     'cflags_cc': ['-std=c++17'],
-    'msvs_settings': {
-      'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+    'xcode_settings': {
+      'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+      'CLANG_CXX_LIBRARY': 'libc++',
+      'MACOSX_DEPLOYMENT_TARGET': '11',
+      'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
+      'OTHER_CFLAGS': [
+          '-std=c++17',
+          '-stdlib=libc++'
+        ],
     },
-    'link_settings': {
-      'libraries': [
-        '<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.a',
-      ]
+    'msvs_settings': {
+      'VCCLCompilerTool': {
+        'ExceptionHandling': 1,
+        'AdditionalOptions': [
+          '-std:c++17'
+        ]
+      }
     },
   }]
 }

etc/install-zstd.sh

@@ -11,18 +11,16 @@ download_zstd() {
 
 	curl -L "https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz" \
 	 	| tar  -zxf - -C deps/zstd --strip-components 1
-	
-	ls deps/zstd
 }
 
 build_zstd() {
-	export MACOSX_DEPLOYMENT_TARGET=10.12
+	export MACOSX_DEPLOYMENT_TARGET=11
 	cd deps/zstd/build/cmake
 
-	cmake -G "Unix Makefiles" .
-
-	echo "current dir: $(pwd)"
-	make
+	# CMAKE_RC_FLAGS is a workaround for a bug in 1.5.6 that breaks compilation on windows.
+	# The fix is merged but not yet released. see https://github.com/facebook/zstd/issues/3999
+	cmake -DCMAKE_RC_FLAGS="$(pwd)/lib" -DZSTD_MULTITHREAD_SUPPORT=OFF -DZSTD_BUILD_SHARED=OFF .
+	cmake --build .
 }
 
 clean_deps