Merge branch 'feature/nan2' into develop

mikeseven · Sep 13, 2015 · 5ed5d6e · 5ed5d6e
2 parents 50e7e86 + 29f2be7
commit 5ed5d6e
Show file tree

Hide file tree

Showing 7 changed files with 359 additions and 353 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -14,10 +14,11 @@
     {
       'target_name': 'glfw',
       'defines': [
-        'VERSION=0.3.1',
+        'VERSION=0.4.0',
       ],
       'sources': [
-        'src/atb.cc', 'src/glfw.cc'
+        'src/atb.cc',
+        'src/glfw.cc'
       ],
       'include_dirs': [
         "<!(node -e \"require('nan')\")",

diff --git a/deps b/deps
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-glfw",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "A NodeJS wrapper around GLFW 3.x library",
   "main": "index.js",
   "author": "Mikael Bourges-Sevenier <mikeseven@gmail.com>",
@@ -33,12 +33,12 @@
     "test": "test"
   },
   "engines": {
-    "node": "0.6.5-0.11.10"
+    "node": ">=0.6.5 <4.0.0"
   },
   "scripts": {
     "install": "node-gyp rebuild"
   },
   "dependencies": {
-    "nan": "^1.2.0"
+    "nan": "^2.0.9"
   }
 }