Merge pull request #19 from Contra/master

Update binding.gyp (fixes #18)
pkrumins · Apr 2, 2013 · de7ee61 · de7ee61
2 parents 9bd58f2 + 5626955
commit de7ee61
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -11,8 +11,34 @@
                 "src/module.cpp",
                 "src/buffer_compat.cpp",
             ],
-            "include_dirs" : [ "gyp/include" ]
+            "conditions" : [
+                [
+                    'OS=="linux"', {
+                        "libraries" : [
+                            '-lpng',
+                            '-lz'
+                        ],
+                        'cflags!': [ '-fno-exceptions' ],
+                        'cflags_cc!': [ '-fno-exceptions' ]
+                    }
+                ],
+                [
+                    'OS=="mac"', {
+                        'xcode_settings': {
+                            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
+                        }
+                    }
+                ],
+                [
+                    'OS=="win"', {
+                        "include_dirs" : [ "gyp/include" ],
+                        "libraries" : [
+                            '<(module_root_dir)/gyp/lib/libpng.lib',
+                            '<(module_root_dir)/gyp/lib/zlib.lib'
+                        ]
+                    }
+                ]
+            ]
         }
     ]
 }
-
diff --git a/package.json b/package.json
@@ -30,9 +30,6 @@
    },
    "engines": {
        "node": ">=0.6.0"
-   },
-   "scripts": {
-       "install": "node-waf configure build"
    }
 }