Skip to content

Commit 93dd6c1

Browse files
authored
Merge pull request #518 from Bartel-C8/5.x-fixElectron21
2 parents e110478 + 15c3562 commit 93dd6c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

binding.gyp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
'xcode_settings': {
4848
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
4949
'MACOSX_DEPLOYMENT_TARGET': '10.15',
50+
'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
5051
},
5152
'libraries': ['<(PRODUCT_DIR)/../../zmq/lib/libzmq.a'],
5253
'include_dirs': ['<(PRODUCT_DIR)/../../zmq/include'],
@@ -56,6 +57,7 @@
5657
['OS=="linux"', {
5758
'libraries': ['<(PRODUCT_DIR)/../../zmq/lib/libzmq.a'],
5859
'include_dirs': ['<(PRODUCT_DIR)/../../zmq/include'],
60+
'cflags_cc': [ '-std=c++17' ],
5961
}],
6062
],
6163
}],

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"scripts": {
2828
"install": "node-gyp-build || npm run build:libzmq",
2929
"build:libzmq": "node-gyp rebuild",
30-
"prebuildify": "prebuildify -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 --strip",
31-
"prebuildify-ia32": "prebuildify --arch=ia32 -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 --strip",
30+
"prebuildify": "prebuildify -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 -t electron@21.2.3 --strip",
31+
"prebuildify-ia32": "prebuildify --arch=ia32 -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 -t electron@21.2.3 --strip",
3232
"build:docs": "jsdoc -R README.md -d docs lib/*.js",
3333
"test": "mocha --expose-gc --slow 300",
3434
"test:electron": "electron-mocha --slow 300",

0 commit comments

Comments
 (0)