diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-05 15:06:15 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-13 12:58:04 -0400 |
| commit | 1eeb7b65e9acdc5f75c61a560f22c9297014f1d3 (patch) | |
| tree | da5ef7adeb5bb9548f4fd45a5339bf8e58f5d5d7 /binding.gyp | |
| parent | 62816a9476ab6626a7201b636bf295a7823f4c60 (diff) | |
| download | qtlocation-mapboxgl-1eeb7b65e9acdc5f75c61a560f22c9297014f1d3.tar.gz | |
update travis script for https://github.com/mapbox/mapbox-gl-native/pull/1339
refactor mbgl travis scripts
source travis_helper.sh, run setup.sh
pushd/popd
sudo false
travis matrix with c++14 support?
drop setup_mesa.sh
update binding.gyp
language: c
drop thread_object, add async_queue
fix async_queue.hpp includes
std::make_unique
pip install awscli
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/binding.gyp b/binding.gyp index a359f72bd7..c138be5522 100644 --- a/binding.gyp +++ b/binding.gyp @@ -21,32 +21,49 @@ 'src/node_map.cpp', 'src/node_request.hpp', 'src/node_request.cpp', + 'src/util/async_queue.hpp', ], - 'variables': { - 'cflags_cc': [ - '-Wno-unused-parameter', - ], - }, - 'conditions': [ - ['OS == "mac"', { + ['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.9', - 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + 'CLANG_CXX_LIBRARY': 'libc++', + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', + 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', - } + 'GCC_ENABLE_CPP_RTTI': 'YES', + 'OTHER_CPLUSPLUSFLAGS': [ + '-Werror', + '-Wall', + '-Wextra', + '-Wshadow', + '-Wno-variadic-macros', + '-Wno-error=unused-parameter', + '-frtti', + '-fexceptions', + ], + 'GCC_WARN_PEDANTIC': 'YES', + 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE', + 'MACOSX_DEPLOYMENT_TARGET': '10.9', + }, }, { 'cflags_cc': [ - '-std=c++11', + '-std=c++14', + '-Werror', + '-Wall', + '-Wextra', + '-Wno-variadic-macros', + '-Wno-error=unused-parameter', + '-frtti', '-fexceptions', - '<@(cflags_cc)', ], 'libraries': [ '<@(glfw3_ldflags)' ], - }] + }], + ['OS=="linux"', { + 'cflags_cc': [ + '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin. + ], + }], ], }, |