| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 'toolkit_views%': 0, | 171 'toolkit_views%': 0, |
| 172 }], | 172 }], |
| 173 | 173 |
| 174 # Set toolkit_uses_gtk for the Chromium browser on Linux. | 174 # Set toolkit_uses_gtk for the Chromium browser on Linux. |
| 175 ['desktop_linux==1 and use_aura==0 and use_ozone==0', { | 175 ['desktop_linux==1 and use_aura==0 and use_ozone==0', { |
| 176 'toolkit_uses_gtk%': 1, | 176 'toolkit_uses_gtk%': 1, |
| 177 }, { | 177 }, { |
| 178 'toolkit_uses_gtk%': 0, | 178 'toolkit_uses_gtk%': 0, |
| 179 }], | 179 }], |
| 180 | 180 |
| 181 # Enable HiDPI on Mac OS and Chrome OS. | 181 # Enable HiDPI on Mac OS, Chrome OS and Windows. |
| 182 ['OS=="mac" or chromeos==1', { | 182 ['OS=="mac" or chromeos==1 or OS=="win"', { |
| 183 'enable_hidpi%': 1, | 183 'enable_hidpi%': 1, |
| 184 }], | 184 }], |
| 185 | 185 |
| 186 # Enable App Launcher on ChromeOS, Windows and OSX. | 186 # Enable App Launcher on ChromeOS, Windows and OSX. |
| 187 # On Linux, enable App Launcher for the Aura build. | 187 # On Linux, enable App Launcher for the Aura build. |
| 188 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au
ra==1)', { | 188 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au
ra==1)', { |
| 189 'enable_app_list%': 1, | 189 'enable_app_list%': 1, |
| 190 }, { | 190 }, { |
| 191 'enable_app_list%': 0, | 191 'enable_app_list%': 0, |
| 192 }], | 192 }], |
| (...skipping 4840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5033 # settings in target dicts. SYMROOT is a special case, because many other | 5033 # settings in target dicts. SYMROOT is a special case, because many other |
| 5034 # Xcode variables depend on it, including variables such as | 5034 # Xcode variables depend on it, including variables such as |
| 5035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5037 # files to appear (when present) in the UI as actual files and not red | 5037 # files to appear (when present) in the UI as actual files and not red |
| 5038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5039 # and therefore SYMROOT, needs to be set at the project level. | 5039 # and therefore SYMROOT, needs to be set at the project level. |
| 5040 'SYMROOT': '<(DEPTH)/xcodebuild', | 5040 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5041 }, | 5041 }, |
| 5042 } | 5042 } |
| OLD | NEW |