| 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 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 # To do a shared build on linux we need to be able to choose between type | 65 # To do a shared build on linux we need to be able to choose between type |
| 66 # static_library and shared_library. We default to doing a static build | 66 # static_library and shared_library. We default to doing a static build |
| 67 # but you can override this with "gyp -Dlibrary=shared_library" or you | 67 # but you can override this with "gyp -Dlibrary=shared_library" or you |
| 68 # can add the following line (without the #) to ~/.gyp/include.gypi | 68 # can add the following line (without the #) to ~/.gyp/include.gypi |
| 69 # {'variables': {'library': 'shared_library'}} | 69 # {'variables': {'library': 'shared_library'}} |
| 70 # to compile as shared by default | 70 # to compile as shared by default |
| 71 'library%': 'static_library', | 71 'library%': 'static_library', |
| 72 | 72 |
| 73 # The Google Update appid. | 73 # The Google Update appid. |
| 74 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', | 74 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', |
| 75 |
| 76 # Extra defines to add to built targets |
| 77 'extra_custom_defines%': [], |
| 75 | 78 |
| 76 # TODO(bradnelson): eliminate this when possible. | 79 # TODO(bradnelson): eliminate this when possible. |
| 77 # To allow local gyp files to prevent release.vsprops from being included. | 80 # To allow local gyp files to prevent release.vsprops from being included. |
| 78 # Yes(1) means include release.vsprops. | 81 # Yes(1) means include release.vsprops. |
| 79 # Once all vsprops settings are migrated into gyp, this can go away. | 82 # Once all vsprops settings are migrated into gyp, this can go away. |
| 80 'msvs_use_common_release%': 1, | 83 'msvs_use_common_release%': 1, |
| 81 | 84 |
| 82 # TODO(bradnelson): eliminate this when possible. | 85 # TODO(bradnelson): eliminate this when possible. |
| 83 # To allow local gyp files to override additional linker options for msvs. | 86 # To allow local gyp files to override additional linker options for msvs. |
| 84 # Yes(1) means set use the common linker options. | 87 # Yes(1) means set use the common linker options. |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 }], | 165 }], |
| 163 ], | 166 ], |
| 164 }], | 167 }], |
| 165 ], | 168 ], |
| 166 }, | 169 }, |
| 167 'target_defaults': { | 170 'target_defaults': { |
| 168 'variables': { | 171 'variables': { |
| 169 'mac_release_optimization%': '3', # Use -O3 unless overridden | 172 'mac_release_optimization%': '3', # Use -O3 unless overridden |
| 170 'mac_debug_optimization%': '0' # Use -O0 unless overridden | 173 'mac_debug_optimization%': '0' # Use -O0 unless overridden |
| 171 }, | 174 }, |
| 175 'defines': [ |
| 176 '<@(extra_custom_defines)', |
| 177 ], |
| 172 'conditions': [ | 178 'conditions': [ |
| 173 ['branding=="Chrome"', { | 179 ['branding=="Chrome"', { |
| 174 'defines': ['GOOGLE_CHROME_BUILD'], | 180 'defines': ['GOOGLE_CHROME_BUILD'], |
| 175 }, { # else: branding!="Chrome" | 181 }, { # else: branding!="Chrome" |
| 176 'defines': ['CHROMIUM_BUILD'], | 182 'defines': ['CHROMIUM_BUILD'], |
| 177 }], | 183 }], |
| 178 ['toolkit_views==1', { | 184 ['toolkit_views==1', { |
| 179 'defines': ['TOOLKIT_VIEWS=1'], | 185 'defines': ['TOOLKIT_VIEWS=1'], |
| 180 }], | 186 }], |
| 181 ['chromeos==1', { | 187 ['chromeos==1', { |
| (...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 # settings in target dicts. SYMROOT is a special case, because many other | 777 # settings in target dicts. SYMROOT is a special case, because many other |
| 772 # Xcode variables depend on it, including variables such as | 778 # Xcode variables depend on it, including variables such as |
| 773 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 779 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 774 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 780 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 775 # files to appear (when present) in the UI as actual files and not red | 781 # files to appear (when present) in the UI as actual files and not red |
| 776 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 782 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 777 # and therefore SYMROOT, needs to be set at the project level. | 783 # and therefore SYMROOT, needs to be set at the project level. |
| 778 'SYMROOT': '<(DEPTH)/xcodebuild', | 784 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 779 }, | 785 }, |
| 780 } | 786 } |
| OLD | NEW |