| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 3964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3975 }], # OS=="mac" | 3975 }], # OS=="mac" |
| 3976 ['OS=="ios"', { | 3976 ['OS=="ios"', { |
| 3977 'target_defaults': { | 3977 'target_defaults': { |
| 3978 'xcode_settings' : { | 3978 'xcode_settings' : { |
| 3979 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', | 3979 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
| 3980 | 3980 |
| 3981 # This next block is mostly common with the 'mac' section above, | 3981 # This next block is mostly common with the 'mac' section above, |
| 3982 # but keying off (or setting) 'clang' isn't valid for iOS as it | 3982 # but keying off (or setting) 'clang' isn't valid for iOS as it |
| 3983 # also seems to mean using the custom build of clang. | 3983 # also seems to mean using the custom build of clang. |
| 3984 | 3984 |
| 3985 # TODO(stuartmorgan): switch to c++0x (see TODOs in the clang |
| 3986 # section above). |
| 3987 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', |
| 3985 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default | 3988 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default |
| 3986 # when building with clang. This warning is triggered when the | 3989 # when building with clang. This warning is triggered when the |
| 3987 # override keyword is used via the OVERRIDE macro from | 3990 # override keyword is used via the OVERRIDE macro from |
| 3988 # base/compiler_specific.h. | 3991 # base/compiler_specific.h. |
| 3989 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', | 3992 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', |
| 3990 # Warn if automatic synthesis is triggered with | 3993 # Warn if automatic synthesis is triggered with |
| 3991 # the -Wobjc-missing-property-synthesis flag. | 3994 # the -Wobjc-missing-property-synthesis flag. |
| 3992 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | 3995 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| 3993 'WARNING_CFLAGS': [ | 3996 'WARNING_CFLAGS': [ |
| 3994 '-Wheader-hygiene', | 3997 '-Wheader-hygiene', |
| 3995 # Don't die on dtoa code that uses a char as an array index. | 3998 # Don't die on dtoa code that uses a char as an array index. |
| 3996 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 3999 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 3997 '-Wno-char-subscripts', | 4000 '-Wno-char-subscripts', |
| 3998 # Clang spots more unused functions. | 4001 # Clang spots more unused functions. |
| 3999 '-Wno-unused-function', | 4002 '-Wno-unused-function', |
| 4000 # See comments on this flag higher up in this file. | 4003 # See comments on this flag higher up in this file. |
| 4001 '-Wno-unnamed-type-template-args', | 4004 '-Wno-unnamed-type-template-args', |
| 4002 # This (rightfully) complains about 'override', which we use | 4005 # Match OS X clang C++11 warning settings. |
| 4003 # heavily. | 4006 '-Wno-c++11-narrowing', |
| 4004 '-Wno-c++11-extensions', | 4007 '-Wno-reserved-user-defined-literal', |
| 4005 ], | 4008 ], |
| 4006 }, | 4009 }, |
| 4007 'target_conditions': [ | 4010 'target_conditions': [ |
| 4008 ['_toolset=="host"', { | 4011 ['_toolset=="host"', { |
| 4009 'xcode_settings': { | 4012 'xcode_settings': { |
| 4010 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot | 4013 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot |
| 4011 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', | 4014 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', |
| 4012 }, | 4015 }, |
| 4013 }], | 4016 }], |
| 4014 ['_toolset=="target"', { | 4017 ['_toolset=="target"', { |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4439 # settings in target dicts. SYMROOT is a special case, because many other | 4442 # settings in target dicts. SYMROOT is a special case, because many other |
| 4440 # Xcode variables depend on it, including variables such as | 4443 # Xcode variables depend on it, including variables such as |
| 4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4444 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4445 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4443 # files to appear (when present) in the UI as actual files and not red | 4446 # files to appear (when present) in the UI as actual files and not red |
| 4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4447 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4445 # and therefore SYMROOT, needs to be set at the project level. | 4448 # and therefore SYMROOT, needs to be set at the project level. |
| 4446 'SYMROOT': '<(DEPTH)/xcodebuild', | 4449 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4447 }, | 4450 }, |
| 4448 } | 4451 } |
| OLD | NEW |