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 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1165 'use_cups%': 0, | 1165 'use_cups%': 0, |
1166 }], | 1166 }], |
1167 | 1167 |
1168 # Native Client glibc toolchain is enabled by default except on arm. | 1168 # Native Client glibc toolchain is enabled by default except on arm. |
1169 ['target_arch=="arm"', { | 1169 ['target_arch=="arm"', { |
1170 'disable_glibc%': 1, | 1170 'disable_glibc%': 1, |
1171 }, { | 1171 }, { |
1172 'disable_glibc%': 0, | 1172 'disable_glibc%': 0, |
1173 }], | 1173 }], |
1174 | 1174 |
1175 # Disable SSE2 when building for ARM or MIPS. | |
1176 ['target_arch=="arm" or target_arch=="mipsel"', { | |
1177 'disable_sse2%': 1, | |
1178 }, { | |
1179 'disable_sse2%': 0, | |
tony
2012/09/21 19:29:19
Nit: I think you can delete the disable_sse2% vari
petarj
2012/09/21 21:19:42
If I do that, gyp complains with:
"gyp: Undefined
tony
2012/09/21 21:27:55
Ah, you're right. I would delete the lines around
petarj
2012/09/21 22:02:21
I was actually experimenting with this one before,
tony
2012/09/21 22:40:45
I see, target_arch is defined at the same level as
| |
1180 }], | |
1181 | |
1175 # Set the relative path from this file to the GYP file of the JPEG | 1182 # Set the relative path from this file to the GYP file of the JPEG |
1176 # library used by Chromium. | 1183 # library used by Chromium. |
1177 ['use_system_libjpeg==1 or use_libjpeg_turbo==0', { | 1184 ['use_system_libjpeg==1 or use_libjpeg_turbo==0', { |
1178 # Configuration for using the system libjeg is here. | 1185 # Configuration for using the system libjeg is here. |
1179 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', | 1186 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', |
1180 }, { | 1187 }, { |
1181 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', | 1188 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', |
1182 }], | 1189 }], |
1183 | 1190 |
1184 # Options controlling the use of GConf (the classic GNOME configuration | 1191 # Options controlling the use of GConf (the classic GNOME configuration |
(...skipping 2293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3478 # settings in target dicts. SYMROOT is a special case, because many other | 3485 # settings in target dicts. SYMROOT is a special case, because many other |
3479 # Xcode variables depend on it, including variables such as | 3486 # Xcode variables depend on it, including variables such as |
3480 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3487 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3481 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3488 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3482 # files to appear (when present) in the UI as actual files and not red | 3489 # files to appear (when present) in the UI as actual files and not red |
3483 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3490 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3484 # and therefore SYMROOT, needs to be set at the project level. | 3491 # and therefore SYMROOT, needs to be set at the project level. |
3485 'SYMROOT': '<(DEPTH)/xcodebuild', | 3492 'SYMROOT': '<(DEPTH)/xcodebuild', |
3486 }, | 3493 }, |
3487 } | 3494 } |
OLD | NEW |