Skip to content

Commit f58ff73

Browse files
committed
Merge pull request brianc#477 from rvagg/nan
use NAN for Node 0.8->0.11+ compatibility
2 parents d246786 + 6cb1671 commit f58ff73

File tree

4 files changed

+94
-139
lines changed

4 files changed

+94
-139
lines changed

binding.gyp

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
'targets': [
33
{
44
'target_name': 'binding',
5+
'sources': ['src/binding.cc'],
6+
'include_dirs': [
7+
'<!@(pg_config --includedir)',
8+
'<!(node -e \'require("nan")\')'
9+
],
510
'conditions' : [
611
['OS=="win"', {
712
'conditions' : [
813
['"<!@(cmd /C where /Q pg_config || echo n)"!="n"',
914
{
10-
'sources': ['src/binding.cc'],
11-
'include_dirs': ['<!@(pg_config --includedir)'],
1215
'libraries' : ['libpq.lib'],
1316
'msvs_settings': {
1417
'VCLinkerTool' : {
@@ -24,8 +27,6 @@
2427
'conditions' : [
2528
['"y"!="n"', # ToDo: add pg_config existance condition that works on linux
2629
{
27-
'sources': ['src/binding.cc'],
28-
'include_dirs': ['<!@(pg_config --includedir)'],
2930
'libraries' : ['-lpq -L<!@(pg_config --libdir)']
3031
}
3132
]

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"main": "./lib",
2020
"dependencies": {
2121
"generic-pool": "2.0.3",
22-
"buffer-writer": "1.0.0"
22+
"buffer-writer": "1.0.0",
23+
"nan": "~0.6.0"
2324
},
2425
"devDependencies": {
2526
"jshint": "1.1.0",

0 commit comments

Comments
 (0)