summaryrefslogtreecommitdiff
path: root/binding.gyp
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-02-05 17:19:26 -0500
committerMike Morris <michael.patrick.morris@gmail.com>2015-02-10 15:24:02 -0800
commitdf396d7d89bc986ad16620a18b2025c3d20b41c4 (patch)
tree367b43ed49dd5d0113c0d8496dbc1bea396c8296 /binding.gyp
parentf8a7a4425d1c97e2ff5dce554d390698bc0e389c (diff)
downloadqtlocation-mapboxgl-df396d7d89bc986ad16620a18b2025c3d20b41c4.tar.gz
get tests passing on travis
add iam template with mapbox-gl-testing and mapbox-node-binary permissions add travis build scripts and .travis.yml rm -f platform gypi map.resize is private now, called by view.resize set stdlib and c++11 per platform, link glfw3 ldflags on linux pass --clang to node-gyp per https://github.com/mapbox/mapbox-gl-native/pull/364#issuecomment-51735692
Diffstat (limited to 'binding.gyp')
-rw-r--r--binding.gyp15
1 files changed, 9 insertions, 6 deletions
diff --git a/binding.gyp b/binding.gyp
index 0d4922fad5..fb18393908 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -23,24 +23,27 @@
'variables': {
'cflags_cc': [
- '-std=c++11',
- '-stdlib=libc++',
- '-Wno-unused-parameter'
+ '-Wno-unused-parameter',
],
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
+ "CLANG_CXX_LIBRARY": "libc++",
+ "CLANG_CXX_LANGUAGE_STANDARD":"c++11",
+ "GCC_VERSION": "com.apple.compilers.llvm.clang.1_0",
'MACOSX_DEPLOYMENT_TARGET': '10.7',
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
- 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
+ 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
}
}, {
'cflags_cc': [
- '<@(cflags_cc)',
+ '-std=c++11',
'-fexceptions',
+ '<@(cflags_cc)',
],
+ 'libraries': [ '<@(glfw3_ldflags)' ],
}]
],
},
@@ -56,4 +59,4 @@
]
}
]
-} \ No newline at end of file
+}