| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1526 # http://code.google.com/p/googletest/source/detail?r=446 . | 1526 # http://code.google.com/p/googletest/source/detail?r=446 . |
| 1527 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ) | 1527 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ) |
| 1528 '-Wno-unnamed-type-template-args', | 1528 '-Wno-unnamed-type-template-args', |
| 1529 ], | 1529 ], |
| 1530 'cflags!': [ | 1530 'cflags!': [ |
| 1531 # Clang doesn't seem to know know this flag. | 1531 # Clang doesn't seem to know know this flag. |
| 1532 '-mfpmath=sse', | 1532 '-mfpmath=sse', |
| 1533 ], | 1533 ], |
| 1534 }], | 1534 }], |
| 1535 ['clang==1 and clang_use_chrome_plugins==1', { | 1535 ['clang==1 and clang_use_chrome_plugins==1', { |
| 1536 'target_conditions': [ | 1536 'cflags': [ |
| 1537 ['_toolset=="target"', { | 1537 '<(clang_chrome_plugins_flags)', |
| 1538 'cflags': [ | 1538 ], |
| 1539 '<(clang_chrome_plugins_flags)', | |
| 1540 ], | |
| 1541 }]], | |
| 1542 }], | 1539 }], |
| 1543 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 1540 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 1544 'target_conditions': [ | 1541 'cflags': [ |
| 1545 ['_toolset=="target"', { | 1542 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 1546 'cflags': [ | 1543 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| 1547 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 1544 ], |
| 1548 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | |
| 1549 ], | |
| 1550 }]], | |
| 1551 }], | 1545 }], |
| 1552 ['no_strict_aliasing==1', { | 1546 ['no_strict_aliasing==1', { |
| 1553 'cflags': [ | 1547 'cflags': [ |
| 1554 '-fno-strict-aliasing', | 1548 '-fno-strict-aliasing', |
| 1555 ], | 1549 ], |
| 1556 }], | 1550 }], |
| 1557 ['linux_breakpad==1', { | 1551 ['linux_breakpad==1', { |
| 1558 'cflags': [ '-g' ], | 1552 'cflags': [ '-g' ], |
| 1559 'defines': ['USE_LINUX_BREAKPAD'], | 1553 'defines': ['USE_LINUX_BREAKPAD'], |
| 1560 }], | 1554 }], |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 # settings in target dicts. SYMROOT is a special case, because many other | 1940 # settings in target dicts. SYMROOT is a special case, because many other |
| 1947 # Xcode variables depend on it, including variables such as | 1941 # Xcode variables depend on it, including variables such as |
| 1948 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 1942 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 1949 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 1943 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 1950 # files to appear (when present) in the UI as actual files and not red | 1944 # files to appear (when present) in the UI as actual files and not red |
| 1951 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 1945 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 1952 # and therefore SYMROOT, needs to be set at the project level. | 1946 # and therefore SYMROOT, needs to be set at the project level. |
| 1953 'SYMROOT': '<(DEPTH)/xcodebuild', | 1947 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1954 }, | 1948 }, |
| 1955 } | 1949 } |
| OLD | NEW |