Skip to content

Commit 4812cad

Browse files
committed
fix: fix the windows runtime library + debug builds
1 parent 3f9ed2e commit 4812cad

File tree

5 files changed

+524
-39
lines changed

5 files changed

+524
-39
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ build-tmp-napi-v*
1212
prebuilds
1313
test.js
1414
.cache/
15+
test/typings-compatibility/

binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'outputs': ['build/libzmq/lib/libzmq.lib', 'build/libzmq/include/zmq.h', 'build/libzmq/include/zmq_utils.h'],
2626
}],
2727
],
28-
'action': ['ts-node', '<(PRODUCT_DIR)/../../script/build.ts', '<(CONFIGURATION_NAME)'],
28+
'action': ['ts-node', '<(PRODUCT_DIR)/../../script/build.ts'],
2929
}],
3030
}],
3131
],

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"url": "https://github.com/zeromq/zeromq.js.git"
1818
},
1919
"dependencies": {
20-
"@types/shelljs": "^0.8.11",
2120
"@types/node": "^18.11.9",
21+
"@types/shelljs": "^0.8.11",
22+
"cross-env": "^7.0.3",
2223
"node-gyp-build": "^4.5.0",
2324
"shelljs": "^0.8.5",
2425
"ts-node": "10.9"
@@ -41,6 +42,7 @@
4142
"mocha": ">=10.1",
4243
"node-addon-api": "^5.0.0",
4344
"node-fetch": "^3.3.0",
45+
"node-gyp": "^9.3.0",
4446
"npm-run-all2": "^6.0.4",
4547
"prebuildify": "^5.0.1",
4648
"prettier": "^2.7.1",
@@ -78,8 +80,8 @@
7880
"build.js": "tsc --project tsconfig-build.json && node script/ci/downlevel-dts.js",
7981
"build.doc": "typedoc --out docs --name zeromq.js --excludeProtected --excludePrivate --excludeNotExported --excludeExternals --externalPattern 'src/+(draft|native|compat).ts' --tsconfig tsconfig-build.json --mode file",
8082
"prebuild": "ts-node -P ./tsconfig.json ./script/prebuild.ts",
81-
"build.native": "prebuildify --napi --build-from-source",
82-
"build.native.debug": "run-s build.native -- --debug",
83+
"build.native": "node-gyp configure --release && node-gyp build --release",
84+
"build.native.debug": "cross-env CMAKE_BUILD_TYPE=Debug node-gyp configure --debug && cross-env CMAKE_BUILD_TYPE=Debug node-gyp build --debug",
8385
"build": "run-p build.js build.native",
8486
"build.debug": "run-p build.js build.native.debug",
8587
"test": "run-s build.debug && mocha",

0 commit comments

Comments
 (0)