WIP on moving to gyp

peterbraden · Jul 5, 2012 · 5c12433 · 5c12433
1 parent 1adb840
commit 5c12433
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Then:
 Or to build the repo:
 
 
-        node-waf configure && node-waf build
+        node-gyp rebuild
 
 
 ## Examples

diff --git a/binding.gyp b/binding.gyp
@@ -1,14 +1,17 @@
 {
   "targets": [{ 
-    "target_name": "opencv"
+      "target_name": "opencv"
       , "sources": [ 
-          "src/CascadeClassifierWrap.cc"
-        , "src/init.cc"
+          "src/init.cc"
         , "src/Matrix.cc"
         , "src/OpenCV.cc"
+        , "src/CascadeClassifierWrap.cc"
         , "src/Point.cc"
-        , "src/VideoCaptureWrap.cc" ]
+        , "src/VideoCaptureWrap.cc"
+        ]
+      , "cflags" : ["-O3", "-Wall", "<!@(pkg-config --cflags opencv]"]  
+      , "libraries" : ["<!@(pkg-config --libs opencv)"]
+
       }]
-  , "libraries": ['-l/lib/opencv.lib' ]
 }
 
diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-node-waf configure build &&
+node-gyp rebuild &&
 cd examples &&
 #node face_detection.js
 node $1
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     }
  , "engine": "node >= 0.4.1"
  , "scripts": {
-   "preinstall": "node-waf configure build"
+   "preinstall": "node-gyp rebuild"
    , "test": "node test/unit.js"
  }
  , "main": "./lib/opencv"

diff --git a/smoke.sh b/smoke.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-node-waf configure && node-waf -v build && echo '-- Compiled OK -- 
+node-gyp -d rebuild && echo '-- Compiled OK -- 
 
 ' && node  smoketest.js && echo '-- Smoke Done, running tests --
 

diff --git a/src/OpenCV.h b/src/OpenCV.h
@@ -1,10 +1,6 @@
 #ifndef __NODE_OPENCV_H__
 #define __NODE_OPENCV_H__
 
-#ifdef __cplusplus
-  #import "opencv2/opencv.hpp"
-#endif
-
 #include <v8.h>
 #include <node.h>
 #include <node_object_wrap.h>

diff --git a/wscript b/wscript