| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 | 7 |
| 8 'variables': { | 8 'variables': { |
| 9 'version_py_path': 'tools/build/version.py', | 9 'version_py_path': 'tools/build/version.py', |
| 10 'version_path': 'VERSION', | 10 'version_path': 'VERSION', |
| (...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1182 '$(SDKROOT)/usr/lib/libcups.dylib', | 1182 '$(SDKROOT)/usr/lib/libcups.dylib', |
| 1183 ] | 1183 ] |
| 1184 }, | 1184 }, |
| 1185 }, { | 1185 }, { |
| 1186 'link_settings': { | 1186 'link_settings': { |
| 1187 'libraries': [ | 1187 'libraries': [ |
| 1188 '-lcups', | 1188 '-lcups', |
| 1189 '-lgcrypt', | 1189 '-lgcrypt', |
| 1190 ], | 1190 ], |
| 1191 }, | 1191 }, |
| 1192 }], | 1192 }], |
| 1193 ], | 1193 ], |
| 1194 }], | 1194 }], |
| 1195 ['remoting==1', { | 1195 ['remoting==1', { |
| 1196 'dependencies': [ | 1196 'dependencies': [ |
| 1197 '../remoting/remoting.gyp:chromoting_base', | 1197 '../remoting/remoting.gyp:chromoting_base', |
| 1198 '../remoting/remoting.gyp:chromoting_host', | 1198 '../remoting/remoting.gyp:chromoting_host', |
| 1199 '../remoting/remoting.gyp:chromoting_jingle_glue', | 1199 '../remoting/remoting.gyp:chromoting_jingle_glue', |
| 1200 ], | 1200 ], |
| 1201 }], | 1201 }], |
| 1202 ], | 1202 ], |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1608 { 'targets': [ | 1608 { 'targets': [ |
| 1609 { | 1609 { |
| 1610 # TODO(sgk): remove this when we change the buildbots to | 1610 # TODO(sgk): remove this when we change the buildbots to |
| 1611 # use the generated build\all.sln file to build the world. | 1611 # use the generated build\all.sln file to build the world. |
| 1612 'target_name': 'pull_in_all', | 1612 'target_name': 'pull_in_all', |
| 1613 'type': 'none', | 1613 'type': 'none', |
| 1614 'dependencies': [ | 1614 'dependencies': [ |
| 1615 'installer/mini_installer.gyp:*', | 1615 'installer/mini_installer.gyp:*', |
| 1616 '../app/app.gyp:*', | 1616 '../app/app.gyp:*', |
| 1617 '../base/base.gyp:*', | 1617 '../base/base.gyp:*', |
| 1618 '../ceee/ceee.gyp:*', |
| 1618 '../chrome_frame/chrome_frame.gyp:*', | 1619 '../chrome_frame/chrome_frame.gyp:*', |
| 1619 '../gfx/gfx.gyp:*', | 1620 '../gfx/gfx.gyp:*', |
| 1620 '../ipc/ipc.gyp:*', | 1621 '../ipc/ipc.gyp:*', |
| 1621 '../media/media.gyp:*', | 1622 '../media/media.gyp:*', |
| 1622 '../net/net.gyp:*', | 1623 '../net/net.gyp:*', |
| 1623 '../printing/printing.gyp:*', | 1624 '../printing/printing.gyp:*', |
| 1624 '../sdch/sdch.gyp:*', | 1625 '../sdch/sdch.gyp:*', |
| 1625 '../skia/skia.gyp:*', | 1626 '../skia/skia.gyp:*', |
| 1626 '../testing/gmock.gyp:*', | 1627 '../testing/gmock.gyp:*', |
| 1627 '../testing/gtest.gyp:*', | 1628 '../testing/gtest.gyp:*', |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2009 }], # targets | 2010 }], # targets |
| 2010 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" | 2011 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" |
| 2011 ], # 'conditions' | 2012 ], # 'conditions' |
| 2012 } | 2013 } |
| 2013 | 2014 |
| 2014 # Local Variables: | 2015 # Local Variables: |
| 2015 # tab-width:2 | 2016 # tab-width:2 |
| 2016 # indent-tabs-mode:nil | 2017 # indent-tabs-mode:nil |
| 2017 # End: | 2018 # End: |
| 2018 # vim: set expandtab tabstop=2 shiftwidth=2: | 2019 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |