Skip to content
Browse files

Merge pull request #19 from Contra/master

Update binding.gyp (fixes #18)
  • Loading branch information...
2 parents 9bd58f2 + 5626955 commit de7ee6141c364409e209c633b97b73bcf00e81e2 @pkrumins committed Apr 2, 2013
Showing with 28 additions and 5 deletions.
  1. +28 −2 binding.gyp
  2. +0 −3 package.json
View
30 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'
+ ]
+ }
+ ]
+ ]
}
]
}
-
View
3 package.json
@@ -30,9 +30,6 @@
},
"engines": {
"node": ">=0.6.0"
- },
- "scripts": {
- "install": "node-waf configure build"
}
}

0 comments on commit de7ee61

Please sign in to comment.
Something went wrong with that request. Please try again.