From a45ba33d60a7338113034255c74dff4b8f841cbd Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 13 Apr 2021 19:21:26 -0500 Subject: [PATCH 1/3] Build zeroMq v5 on modern Windows --- binding.gyp | 1 - package.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/binding.gyp b/binding.gyp index 77e12f08..38bb2259 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,7 +17,6 @@ }, { 'conditions': [ ['OS=="win"', { - 'msbuild_toolset': 'v140', 'defines': ['ZMQ_STATIC'], 'include_dirs': ['windows/include'], 'libraries': [ diff --git a/package.json b/package.json index fa9d97ad..abfad926 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,14 @@ }, "dependencies": { "nan": "^2.14.0", - "prebuild-install": "^5.3.2" + "prebuild-install": "^6.1.1" }, "devDependencies": { "electron-mocha": "^6.0.0", "jsdoc": "^3.5.4", "mocha": "^5.0.0", "nyc": "^12.0.2", - "prebuild": "^9.1.1", + "prebuild": "^10.0.1", "semver": "^5.4.1", "should": "^13.0.0" }, From ccd4d3fa60c8dc3a78d1d67f900c864cb7652d5d Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 13 Apr 2021 19:23:18 -0500 Subject: [PATCH 2/3] Target 10.15 (Catalina) on MacOS --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 38bb2259..ac62782c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -28,7 +28,7 @@ ['OS=="mac" or OS=="solaris"', { 'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', - 'MACOSX_DEPLOYMENT_TARGET': '10.9', + 'MACOSX_DEPLOYMENT_TARGET': '10.15', }, 'libraries': ['<(PRODUCT_DIR)/../../zmq/lib/libzmq.a'], 'include_dirs': ['<(PRODUCT_DIR)/../../zmq/include'], From 58d5f01348dfd0c05c53d17f109acc86164e0a9f Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 13 Apr 2021 19:26:51 -0500 Subject: [PATCH 3/3] Update Nan patch releases --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index abfad926..cd16d3ae 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/zeromq/zeromq.js.git" }, "dependencies": { - "nan": "^2.14.0", + "nan": "^2.14.2", "prebuild-install": "^6.1.1" }, "devDependencies": {