Skip to content

fix VS2017 build #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spongman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix VS2017 build #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e0bfd
fix VS2017 build
Spongman Apr 10, 2018
fc1d963
require node-glfw for building
Spongman Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
{
'conditions': [
['OS=="win"', {
'variables': {
'has_glfw': 'true',
'has_nexus': '',
'has_bcm': '',
'has_raspbian': ''
}
}, { # 'OS!="win"'
'variables': {
'has_glfw': '<!(pkg-config glfw3 --libs --silence-errors | grep glfw || true)',
'has_nexus': '<!(pkg-config glesv2 egl --libs --silence-errors | grep nexus || true)',
'has_bcm': '<!(pkg-config glesv2 egl --libs --silence-errors | grep bcm || true)',
'has_raspbian': '<!(PKG_CONFIG_PATH=/opt/vc/lib/pkgconfig/ pkg-config brcmglesv2 brcmegl --libs --silence-errors | grep bcm || true)'
}
}]
],
'targets': [
{
'target_name': 'gles2',
'defines': [
'VERSION=0.0.1'
],
'variables': {
'platform': '<(OS)',
'has_glfw': '<!(pkg-config glfw3 --libs --silence-errors | grep glfw || true)',
'has_nexus': '<!(pkg-config glesv2 egl --libs --silence-errors | grep nexus || true)',
'has_bcm': '<!(pkg-config glesv2 egl --libs --silence-errors | grep bcm || true)',
'has_raspbian': '<!(PKG_CONFIG_PATH=/opt/vc/lib/pkgconfig/ pkg-config brcmglesv2 brcmegl --libs --silence-errors | grep bcm || true)'
'platform': '<(OS)'
},
'include_dirs': [
"<!(node -e \"require('nan')\")",
Expand Down Expand Up @@ -80,13 +93,21 @@
'src/gles2platform.cc',
'src/interface/webgl.cc'
],
'include_dirs': ['<(module_root_dir)/deps/include'],
'library_dirs': ['<(module_root_dir)/deps/windows/lib/<(target_arch)'],
'libraries': ['glew32.lib','opengl32.lib'],
'include_dirs': [
'<(module_root_dir)/deps/include',
'<(module_root_dir)/node_modules/node-glfw/deps/include',
'$(VC_VC_IncludePath)',
'$(UniversalCRT_IncludePath)'
],
'library_dirs': [
'<(module_root_dir)/deps/windows/lib/<(target_arch)',
'<(module_root_dir)/node_modules/node-glfw/deps/windows/lib/<(target_arch)'
],
'libraries': ['glew32.lib','glfw3dll.lib','opengl32.lib'],
'defines' : ['IS_GLEW','WIN32_LEAN_AND_MEAN','VC_EXTRALEAN'],
'msvs_settings' : {
'VCCLCompilerTool' : {
'AdditionalOptions' : ['/O2','/Oy','/GL','/GF','/Gm-','/EHsc','/MT','/GS','/Gy','/GR-','/Gd']
'AdditionalOptions' : ['/Ox','/Oy','/GL','/GF','/Gm-','/EHsc','/MT','/GS','/Gy','/GR-','/Gd']
},
'VCLinkerTool' : {
'AdditionalOptions' : ['/OPT:REF','/OPT:ICF','/LTCG']
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"dependencies": {
"nan": "^2.1.0"
},
"devDependencies": {
"node-glfw": "^0.4.6"
},
"engines": {
"node" : ">=4.0.0"
},
Expand Down
2 changes: 2 additions & 0 deletions src/glew/gles2glewimpl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include <cstring>
#include <vector>
#include <iostream>
#ifndef _WIN32
#include <unistd.h>
#endif
#include <stdio.h>

#include "../gles2impl.h"
Expand Down