From 5c1243329ded1760f7cf464818dd4597f20b02e4 Mon Sep 17 00:00:00 2001
From: Peter Braden <peterbraden@peterbraden.co.uk>
Date: Wed, 4 Jul 2012 18:42:38 -0700
Subject: [PATCH] WIP on moving to gyp

---
 README.md    |  2 +-
 binding.gyp  | 13 ++++++++-----
 build.sh     |  2 +-
 package.json |  2 +-
 smoke.sh     |  2 +-
 src/OpenCV.h |  4 ----
 wscript      | 25 -------------------------
 7 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100755 wscript

diff --git a/README.md b/README.md
index c20f14b..81fb011 100755
--- 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
index 03f94bd..06bf0af 100755
--- 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
index 3929a7a..0b3d083 100755
--- 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
index e740943..75f6ca1 100755
--- 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
index 800517c..18e0933 100755
--- 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
index 10bb32a..bcd1618 100755
--- 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
deleted file mode 100755
index d1b38ad..0000000
--- a/wscript
+++ /dev/null
@@ -1,25 +0,0 @@
-def set_options(opt):
-  opt.tool_options("compiler_cxx")
-
-
-def configure(conf):
-    conf.check_tool('compiler_cxx')
-    conf.check_tool('node_addon')
-    conf.check_cfg(package='opencv',
-      atleast_version='2.3.1',
-      libpath=[
-        '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include', 
-        '/opt/local/include', '/opt/local/lib'],
-      args='--cflags --libs',
-      uselib_store='OPENCV', 
-      mandatory=True)
-
-
-def build(bld):
-    obj = bld.new_task_gen("cxx", "shlib", "node_addon")
-    obj.cxxflags = ["-g", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall"]
-    # This is the name of our extension.
-    obj.target = "opencv"
-    obj.source = bld.glob('src/*.cc')
-    obj.uselib = ['OPENCV']
-