OLD | NEW |
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 Import('env', 'env') | 5 Import('env', 'env') |
6 | 6 |
7 env = env.Clone() | 7 env = env.Clone() |
8 | 8 |
9 env.SConscript([ | 9 env.SConscript([ |
10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| 11 '$BASE_DIR/gfx/using_base_gfx.scons', # needed for logging |
| 12 '$CHROME_SRC_DIR/build/using_googleurl.scons', # needed for logging |
11 '$BREAKPAD_DIR/using_breakpad.scons', | 13 '$BREAKPAD_DIR/using_breakpad.scons', |
12 '$CHROME_DIR/third_party/wtl/using_wtl.scons', | 14 '$CHROME_DIR/third_party/wtl/using_wtl.scons', |
13 '$GTEST_DIR/../using_gtest.scons', | 15 '$GTEST_DIR/../using_gtest.scons', |
14 '$ICU38_DIR/using_icu38.scons', | 16 '$ICU38_DIR/using_icu38.scons', |
15 '$LIBJPEG_DIR/using_libjpeg.scons', | 17 '$LIBJPEG_DIR/using_libjpeg.scons', |
16 '$LIBPNG_DIR/using_libpng.scons', | 18 '$LIBPNG_DIR/using_libpng.scons', |
17 '$LIBXML_DIR/using_libxml.scons', | 19 '$LIBXML_DIR/using_libxml.scons', |
| 20 '$NET_DIR/using_net.scons', # needed for logging |
18 '$NPAPI_DIR/using_npapi.scons', | 21 '$NPAPI_DIR/using_npapi.scons', |
19 '$SKIA_DIR/using_skia.scons', | 22 '$SKIA_DIR/using_skia.scons', |
20 '$ZLIB_DIR/using_zlib.scons', | 23 '$ZLIB_DIR/using_zlib.scons', |
21 ], {'env':env}) | 24 ], {'env':env}) |
22 | 25 |
| 26 # needed for logging |
| 27 env.Append( |
| 28 LIBS = [ |
| 29 'glue', |
| 30 'WTF', |
| 31 ], |
| 32 ) |
| 33 |
23 if env.Bit('posix'): | 34 if env.Bit('posix'): |
24 env.SConscript([ | 35 env.SConscript([ |
25 '$LIBEVENT_DIR/using_libevent.scons', | 36 '$LIBEVENT_DIR/using_libevent.scons', |
26 ], {'env':env}) | 37 ], {'env':env}) |
27 | 38 |
28 # TODO(sgk): convert into a using_*.scons pattern when we update WebKit. | 39 # TODO(sgk): convert into a using_*.scons pattern when we update WebKit. |
29 env.Append( | 40 env.Append( |
30 CPPPATH = [ | 41 CPPPATH = [ |
31 '$WEBKIT_DIR/build/localized_strings', | 42 '$WEBKIT_DIR/build/localized_strings', |
32 ], | 43 ], |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 '$(SolutionDir)../testing/using_gtest.vsprops', | 149 '$(SolutionDir)../testing/using_gtest.vsprops', |
139 ]) | 150 ]) |
140 | 151 |
141 p.AddConfig('Release|Win32', | 152 p.AddConfig('Release|Win32', |
142 InheritedPropertySheets=[ | 153 InheritedPropertySheets=[ |
143 '$(SolutionDir)../build/common.vsprops', | 154 '$(SolutionDir)../build/common.vsprops', |
144 '$(SolutionDir)../build/release.vsprops', | 155 '$(SolutionDir)../build/release.vsprops', |
145 '$(SolutionDir)../skia/using_skia.vsprops', | 156 '$(SolutionDir)../skia/using_skia.vsprops', |
146 '$(SolutionDir)../testing/using_gtest.vsprops', | 157 '$(SolutionDir)../testing/using_gtest.vsprops', |
147 ]) | 158 ]) |
OLD | NEW |