| 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 # 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': { | 9 'variables': { |
| 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 # require --{start,end}-group. There has been a lot of | 449 # require --{start,end}-group. There has been a lot of |
| 450 # refactoring since this was first coded, which might have | 450 # refactoring since this was first coded, which might have |
| 451 # eliminated the circular dependencies. | 451 # eliminated the circular dependencies. |
| 452 # | 452 # |
| 453 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS | 453 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS |
| 454 # so that we prefer our own built libraries (e.g. -lpng) to | 454 # so that we prefer our own built libraries (e.g. -lpng) to |
| 455 # system versions of libraries that pkg-config might turn up. | 455 # system versions of libraries that pkg-config might turn up. |
| 456 # TODO(sgk): investigate handling this not by re-ordering the | 456 # TODO(sgk): investigate handling this not by re-ordering the |
| 457 # flags this way, but by adding a hook to use the SCons | 457 # flags this way, but by adding a hook to use the SCons |
| 458 # ParseFlags() option on the output from pkg-config. | 458 # ParseFlags() option on the output from pkg-config. |
| 459 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LINKFL
AGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], | 459 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', |
| 460 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SH
LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], | 460 '$_LIBDIRFLAGS', '$LINKFLAGS', '$SOURCES', |
| 461 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS',
'$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-grou
p']], | 461 '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], |
| 462 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', |
| 463 '$_LIBDIRFLAGS', '$SHLINKFLAGS', '$SOURCES', |
| 464 '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], |
| 465 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', |
| 466 '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', |
| 467 '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']
], |
| 462 'IMPLICIT_COMMAND_DEPENDENCIES': 0, | 468 'IMPLICIT_COMMAND_DEPENDENCIES': 0, |
| 463 # -rpath is only used when building with shared libraries. | 469 # -rpath is only used when building with shared libraries. |
| 464 'conditions': [ | 470 'conditions': [ |
| 465 [ 'library=="shared_library"', { | 471 [ 'library=="shared_library"', { |
| 466 'RPATH': '$LIB_DIR', | 472 'RPATH': '$LIB_DIR', |
| 467 }], | 473 }], |
| 468 ], | 474 ], |
| 469 }, | 475 }, |
| 470 'scons_import_variables': [ | 476 'scons_import_variables': [ |
| 471 'AS', | 477 'AS', |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 # settings in target dicts. SYMROOT is a special case, because many other | 840 # settings in target dicts. SYMROOT is a special case, because many other |
| 835 # Xcode variables depend on it, including variables such as | 841 # Xcode variables depend on it, including variables such as |
| 836 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 842 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 837 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 843 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 838 # files to appear (when present) in the UI as actual files and not red | 844 # files to appear (when present) in the UI as actual files and not red |
| 839 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 845 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 840 # and therefore SYMROOT, needs to be set at the project level. | 846 # and therefore SYMROOT, needs to be set at the project level. |
| 841 'SYMROOT': '<(DEPTH)/xcodebuild', | 847 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 842 }, | 848 }, |
| 843 } | 849 } |
| OLD | NEW |