Updated linking process to use local libs from node_modules

Author: Simon Hofmann

lib/dirs.js

@@ -0,0 +1,23 @@
+const { join } = require("path");
+
+const isWin = () => process.platform == 'win32'
+
+const isOSX = () => process.platform == 'darwin'
+
+const isUnix = () => !isWin() && !isOSX();
+
+const rootDir = `../node_modules/@nut-tree/opencv-build-${process.platform}`
+const opencvRoot = join(rootDir, 'opencv');
+const opencvBuild = join(opencvRoot, 'build');
+const opencvInclude = join(opencvBuild, 'include');
+const opencvLibDir = isWin() ? join(opencvBuild, 'lib/Release') : join(opencvBuild, 'lib');
+const opencvBinDir = isWin() ? join(opencvBuild, 'bin/Release') : join(opencvBuild, 'bin');
+
+module.exports = {
+    rootDir,
+    opencvRoot,
+    opencvBuild,
+    opencvInclude,
+    opencvLibDir,
+    opencvBinDir
+}

lib/includes.js

@@ -1,4 +1,4 @@
-const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
+const { opencvInclude } = require("./dirs");
 const { resolvePath, defaultDir, linkSystemLibs } = require('./commons');
 
 if (linkSystemLibs()) {
@@ -7,4 +7,4 @@ if (linkSystemLibs()) {
 }
 
 // set include dir from auto build
-console.log(resolvePath(opencvBuild.opencvInclude));
+console.log(opencvInclude);

lib/libs.js

@@ -1,5 +1,6 @@
 const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
 const { resolvePath, getLibDir, linkSystemLibs } = require('./commons');
+const { opencvLibDir } = require("./dirs");
 
 function linkLibs(libs) {
   libs
@@ -13,13 +14,7 @@ if (linkSystemLibs()) {
   return;
 }
 
-// get libs from auto build
-if (process.platform === 'win32') {
-  linkLibs(opencvBuild.getLibs(resolvePath(opencvBuild.opencvLibDir)));
-  return;
-}
-
 // if not windows, link libs dynamically
-console.log('-L' + resolvePath(opencvBuild.opencvLibDir));
+console.log('-L' + opencvLibDir);
 opencvBuild.opencvModules.forEach(lib => console.log(`-lopencv_${lib}`));
-console.log('-Wl,-rpath,' + resolvePath(opencvBuild.opencvLibDir));
+console.log('-Wl,-rpath,' + opencvLibDir);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "opencv4nodejs-prebuilt",
-  "version": "4.15.0-minimal",
+  "version": "4.15.0-slim",
   "description": "This is a fork of opencv4nodejs which provides pre-built binaries",
   "keywords": [
     "opencv",
@@ -44,6 +44,7 @@
   },
   "gypfile": true,
   "dependencies": {
+    "@nut-tree/opencv-build-darwin": "^3.4.6",
     "macro-inferno": "^0.2.3",
     "nan": "^2.12.1",
     "native-node-utils": "^0.1.5",
@@ -55,5 +56,5 @@
   "devDependencies": {
     "prebuild": "^8.2.0"
   },
-  "opencv": "3.4.6-home"
+  "opencv": "3.4.6"
 }