Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit acdeb7a

Browse files
author
Simon Hofmann
committed
Updated rpath, removed win32 path settings
1 parent 43c7aa2 commit acdeb7a

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

lib/cv.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
const path = require('path');
2-
const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
32
const { resolvePath } = require('./commons');
43

5-
// ensure binaries are added to path on windows
6-
if (process.platform === 'win32') {
7-
// append opencv binary path to node process
8-
if (!process.env.path.includes(opencvBuild.opencvBinDir)) {
9-
process.env.path = `${process.env.path};${opencvBuild.opencvBinDir};`
10-
}
11-
}
12-
134
let cv;
145
if (process.env.BINDINGS_DEBUG) {
156
cv = require(path.join(__dirname, '../build/Debug/opencv4nodejs'));

lib/libs.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,10 @@ if (process.platform === 'win32') {
2626
}
2727

2828
// if not windows, link libs dynamically
29-
console.log(`-L..`);
29+
console.log(`-L<(PRODUCT_DIR)`);
3030
opencvBuild.opencvModules.filter(lib => desiredModules.includes(lib)).forEach(lib => console.log(`-lopencv_${lib}`));
31+
if (process.env.BINDINGS_DEBUG) {
32+
console.log('-Wl,-rpath,../build/Debug/opencv4nodejs');
33+
} else {
34+
console.log('-Wl,-rpath,../build/Release/opencv4nodejs');
35+
}

0 commit comments

Comments
 (0)