Permalink
Browse files

Merge pull request #10 from tmpvar/build-on-osx

Build on osx
  • Loading branch information...
mikeseven committed Aug 25, 2014
2 parents 3fd6a84 + 74ab02b commit b2cf658fb914986ae0154d3f14f848e14cb36995
Showing with 5 additions and 3 deletions.
  1. +2 −1 .gitignore
  2. +1 −1 binding.gyp
  3. +1 −1 index.js
  4. +1 −0 package.json
View
@@ -6,4 +6,5 @@ node_glfw.node
build
.DS_Store
Debug
node-glfw.iml
node-glfw.iml
node_modules
View
@@ -23,7 +23,7 @@
'conditions': [
['OS=="linux"', {'libraries': ['-lAntTweakBar', '<!@(pkg-config --libs glfw3 glew)']}],
['OS=="mac"', {
'libraries': ['-lAntTweakBar', '<(module_root_dir)/deps/darwin/libglfw3.a', '-lGLEW', '-framework OpenGL'],
'libraries': ['-lAntTweakBar', '-lglfw3', '-lGLEW', '-framework OpenGL'],
}],
['OS=="win"', {
'libraries': [
View
@@ -1,4 +1,4 @@
var GLFW = module.exports = require('./build/Release/glfw.node');
var GLFW = module.exports = require('bindings')('glfw');
// Easy event emitter based event loop. Started automatically when the first
// listener is added.
View
@@ -39,6 +39,7 @@
"install": "node-gyp rebuild"
},
"dependencies": {
"bindings": "^1.2.1",
"nan": "^0.8.0"
}
}

0 comments on commit b2cf658

Please sign in to comment.