From 6a6fb0ea7eaf4c96256c63f16d82321538b61a2a Mon Sep 17 00:00:00 2001
From: Peter Braden <peterbraden@peterbraden.co.uk>
Date: Mon, 24 Sep 2012 14:49:16 -0700
Subject: [PATCH] move cflags out

---
 .travis.yml |  1 +
 binding.gyp | 21 +++++++--------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d096aee..28e853a 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ before_install:
   - sudo apt-get install libhighgui-dev
   - pkg-config --libs opencv
   - pkg-config --cflags opencv
+  - ls /usr/include
diff --git a/binding.gyp b/binding.gyp
index ae2cd6e..631758a 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -13,6 +13,12 @@
       , 'libraries': [
           '<!@(pkg-config --libs opencv)'
         ]
+      , 'cflags': [
+            '<!@(pkg-config --cflags opencv)'
+            , '-Wall'
+          ]
+      , 'cflags!' : [ '-fno-exceptions']
+      , 'cflags_cc!': [ '-fno-rtti',  '-fno-exceptions']
       , "conditions": [
         ['OS=="mac"', {
           # cflags on OS X are stupid and have to be defined like this
@@ -22,22 +28,9 @@
             ]
             , "GCC_ENABLE_CPP_RTTI": "YES"
             , "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
-          },
-        }, {
-          'cflags': [
-            '<!@(pkg-config --cflags opencv)'
-            , '-Wall'
-          ]
-          , 'cflags!' : [ '-fno-exceptions']
-          , 'cflags_cc!': [ '-fno-rtti',  '-fno-exceptions']
+          }
         }]        
       
-      , ['OS=="linux"', {
-        'cflags': ['<!@(pkg-config --cflags opencv)']
-        , 'cflags!' : ['-fno-exceptions']
-        , 'cflags_cc!' : ['-fno-rtti',  '-fno-exceptions']
-
-      }]
     ]
   }]
 }