| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code%': 0, | 7 'chromium_code%': 0, |
| 8 }, | 8 }, |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 # TODO(bradnelson): This should really be able to be either: | 10 # TODO(bradnelson): This should really be able to be either: |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 'USE_HEADERMAP': 'NO', | 83 'USE_HEADERMAP': 'NO', |
| 84 'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'], | 84 'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'], |
| 85 }, | 85 }, |
| 86 'target_conditions': [ | 86 'target_conditions': [ |
| 87 ['_type=="shared_library"', { | 87 ['_type=="shared_library"', { |
| 88 'xcode_settings': {'GCC_DYNAMIC_NO_PIC': 'NO'}, | 88 'xcode_settings': {'GCC_DYNAMIC_NO_PIC': 'NO'}, |
| 89 }], | 89 }], |
| 90 ['_type!="static_library"', { | 90 ['_type!="static_library"', { |
| 91 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 91 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, |
| 92 }], | 92 }], |
| 93 ['_type=="application"', { |
| 94 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 95 }], |
| 93 ['_type=="application" or _type=="executable"', { | 96 ['_type=="application" or _type=="executable"', { |
| 94 'postbuilds': [ | 97 'postbuilds': [ |
| 95 { | 98 { |
| 96 'variables': { | 99 'variables': { |
| 97 # Define strip_from_xcode in a variable ending in _path so | 100 # Define strip_from_xcode in a variable ending in _path so |
| 98 # that gyp understands it's a path and performs proper | 101 # that gyp understands it's a path and performs proper |
| 99 # relativization during dict merging. | 102 # relativization during dict merging. |
| 100 'strip_from_xcode_path': 'mac/strip_from_xcode', | 103 'strip_from_xcode_path': 'mac/strip_from_xcode', |
| 101 }, | 104 }, |
| 102 'postbuild_name': 'Strip If Needed', | 105 'postbuild_name': 'Strip If Needed', |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 205 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 203 # and therefore SYMROOT, needs to be set at the project level. | 206 # and therefore SYMROOT, needs to be set at the project level. |
| 204 # | 207 # |
| 205 # xcodebuild_gyp is a temporary name to avoid colliding with the xcodebuild | 208 # xcodebuild_gyp is a temporary name to avoid colliding with the xcodebuild |
| 206 # directory used by the non-gyp Xcode build system. When the gyp-based | 209 # directory used by the non-gyp Xcode build system. When the gyp-based |
| 207 # Xcode build system replaces the older system, this should be changed to | 210 # Xcode build system replaces the older system, this should be changed to |
| 208 # simply "xcodebuild" or some other suitable name. | 211 # simply "xcodebuild" or some other suitable name. |
| 209 'SYMROOT': '<(DEPTH)/xcodebuild_gyp', | 212 'SYMROOT': '<(DEPTH)/xcodebuild_gyp', |
| 210 }, | 213 }, |
| 211 } | 214 } |
| OLD | NEW |