| 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS | 212 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS |
| 213 # so that we prefer our own built libraries (e.g. -lpng) to | 213 # so that we prefer our own built libraries (e.g. -lpng) to |
| 214 # system versions of libraries that pkg-config might turn up. | 214 # system versions of libraries that pkg-config might turn up. |
| 215 # TODO(sgk): investigate handling this not by re-ordering the | 215 # TODO(sgk): investigate handling this not by re-ordering the |
| 216 # flags this way, but by adding a hook to use the SCons | 216 # flags this way, but by adding a hook to use the SCons |
| 217 # ParseFlags() option on the output from pkg-config. | 217 # ParseFlags() option on the output from pkg-config. |
| 218 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LINKFL
AGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], | 218 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LINKFL
AGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], |
| 219 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SH
LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], | 219 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SH
LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], |
| 220 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS',
'$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-grou
p']], | 220 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS',
'$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-grou
p']], |
| 221 'IMPLICIT_COMMAND_DEPENDENCIES': 0, | 221 'IMPLICIT_COMMAND_DEPENDENCIES': 0, |
| 222 # -rpath is only used when building with shared libraries. |
| 223 'conditions': [ |
| 224 [ 'library=="shared_library"', { |
| 225 'RPATH': '$LIB_DIR', |
| 226 }], |
| 227 ], |
| 222 }, | 228 }, |
| 223 'scons_import_variables': [ | 229 'scons_import_variables': [ |
| 224 'CC', | 230 'CC', |
| 225 'CXX', | 231 'CXX', |
| 226 'LINK', | 232 'LINK', |
| 227 ], | 233 ], |
| 228 'scons_propagate_variables': [ | 234 'scons_propagate_variables': [ |
| 229 'CC', | 235 'CC', |
| 230 'CCACHE_DIR', | 236 'CCACHE_DIR', |
| 231 'CXX', | 237 'CXX', |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 # settings in target dicts. SYMROOT is a special case, because many other | 424 # settings in target dicts. SYMROOT is a special case, because many other |
| 419 # Xcode variables depend on it, including variables such as | 425 # Xcode variables depend on it, including variables such as |
| 420 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 426 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 421 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 427 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 422 # files to appear (when present) in the UI as actual files and not red | 428 # files to appear (when present) in the UI as actual files and not red |
| 423 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 429 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 424 # and therefore SYMROOT, needs to be set at the project level. | 430 # and therefore SYMROOT, needs to be set at the project level. |
| 425 'SYMROOT': '<(DEPTH)/xcodebuild', | 431 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 426 }, | 432 }, |
| 427 } | 433 } |
| OLD | NEW |