From 1c5fddab6c07f27ef5a56013061320d3212a4a3f Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 1 Sep 2015 15:55:03 -0400 Subject: drop conditions from binding.gyp --- binding.gyp | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'binding.gyp') 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', -- cgit v1.2.1