summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-09-01 15:55:03 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-09-01 15:55:03 -0400
commit1c5fddab6c07f27ef5a56013061320d3212a4a3f (patch)
treeb3dcbe539b323df958c2b2257a6bef43d19a77a8
parent0e79d56b0939de9f4722350a34ab76554a23431c (diff)
downloadqtlocation-mapboxgl-1c5fddab6c07f27ef5a56013061320d3212a4a3f.tar.gz
drop conditions from binding.gyp
-rw-r--r--binding.gyp42
1 files changed, 0 insertions, 42 deletions
diff --git a/binding.gyp b/binding.gyp
index 374ae1afd0..e9f0d6edcd 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -24,48 +24,6 @@
'platform/node/src/node_request.cpp',
'platform/node/src/util/async_queue.hpp',
],
-
- 'conditions': [
- ['OS=="mac"', {
- 'xcode_settings': {
- 'CLANG_CXX_LIBRARY': 'libc++',
- 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
- 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
- 'GCC_ENABLE_CPP_RTTI': 'YES',
- 'OTHER_CPLUSPLUSFLAGS': [
- '-std=c++1y',
- '-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++14',
- '-Werror',
- '-Wall',
- '-Wextra',
- '-Wno-variadic-macros',
- '-Wno-error=unused-parameter',
- '-frtti',
- '-fexceptions',
- ],
- 'libraries': [ '<@(glfw_ldflags)' ],
- }],
- ['OS=="linux"', {
- 'cflags_cc': [
- '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin.
- ],
- }],
- ],
},
{ 'target_name': 'action_after_build',