Permalink
Browse files

Merge branch 'feature/nan2' into develop

  • Loading branch information...
mikeseven committed Sep 13, 2015
2 parents 50e7e86 + 29f2be7 commit 5ed5d6e4396a7434d6f10b8c5e4fd713729c781b
Showing with 359 additions and 353 deletions.
  1. +3 −2 binding.gyp
  2. +1 −1 deps
  3. +3 −3 package.json
  4. +110 −108 src/atb.cc
  5. +9 −9 src/atb.h
  6. +16 −16 src/common.h
  7. +217 −214 src/glfw.cc
View
@@ -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')\")",
View
@@ -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"
}
}
Oops, something went wrong.

0 comments on commit 5ed5d6e

Please sign in to comment.