Skip to content

Commit

Permalink
Merge pull request #445 from aminya/5.x
Browse files Browse the repository at this point in the history
Build zeroMq v5 on Electron 9 - Windows
  • Loading branch information
captainsafia authored Apr 14, 2021
2 parents 8417d54 + 58d5f01 commit 8004371
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}, {
'conditions': [
['OS=="win"', {
'msbuild_toolset': 'v140',
'defines': ['ZMQ_STATIC'],
'include_dirs': ['windows/include'],
'libraries': [
Expand All @@ -29,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'],
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"url": "https://github.com/zeromq/zeromq.js.git"
},
"dependencies": {
"nan": "^2.14.0",
"prebuild-install": "^5.3.2"
"nan": "^2.14.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"
},
Expand Down

0 comments on commit 8004371

Please sign in to comment.