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_res') | 5 Import('env', 'env_res') |
6 | 6 |
7 env = env.Clone() | 7 env = env.Clone() |
8 env_res = env_res.Clone() | 8 env_res = env_res.Clone() |
9 | 9 |
| 10 env.SConscript([ |
| 11 '$CHROME_SRC_DIR/build/using_v8.scons', |
| 12 ], {'env':env}) |
| 13 |
10 if env['PLATFORM'] == 'win32': | 14 if env['PLATFORM'] == 'win32': |
11 env_res.Append( | 15 env_res.Append( |
12 CPPPATH = [ | 16 CPPPATH = [ |
13 '.', | 17 '.', |
14 '$CHROME_SRC_DIR', | 18 '$CHROME_SRC_DIR', |
15 '$NET_DIR', | 19 '$NET_DIR', |
16 ], | 20 ], |
17 RCFLAGS = [ | 21 RCFLAGS = [ |
18 ['/l', '0x409'], | 22 ['/l', '0x409'], |
19 ], | 23 ], |
(...skipping 23 matching lines...) Expand all Loading... |
43 'WebCore', | 47 'WebCore', |
44 'WTF', | 48 'WTF', |
45 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed | 49 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed |
46 'libjpeg', | 50 'libjpeg', |
47 'libpng', | 51 'libpng', |
48 env['XML_LIB'], | 52 env['XML_LIB'], |
49 'libxslt', | 53 'libxslt', |
50 'modp_b64', | 54 'modp_b64', |
51 'zlib', | 55 'zlib', |
52 'sqlite', | 56 'sqlite', |
53 'v8_g', | |
54 'JavaScriptCore_pcre', | 57 'JavaScriptCore_pcre', |
55 'default_plugin', | 58 'default_plugin', |
56 ], | 59 ], |
57 ) | 60 ) |
58 | 61 |
59 if env['PLATFORM'] == 'win32': | 62 if env['PLATFORM'] == 'win32': |
60 # TODO(port): put portable libs in above declaration. | 63 # TODO(port): put portable libs in above declaration. |
61 env.Append( | 64 env.Append( |
62 LIBS = [ | 65 LIBS = [ |
63 'activex_shim', | 66 'activex_shim', |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 'plugin_tests.cc', | 193 'plugin_tests.cc', |
191 # Commented out until a regression is fixed and this file is restored. | 194 # Commented out until a regression is fixed and this file is restored. |
192 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 195 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', |
193 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 196 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', |
194 ]) | 197 ]) |
195 | 198 |
196 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 199 test_shell_tests = env.ChromeTestProgram('test_shell_tests', |
197 resources + test_files) | 200 resources + test_files) |
198 i = env.Install('$TARGET_ROOT', test_shell_tests) | 201 i = env.Install('$TARGET_ROOT', test_shell_tests) |
199 env.Alias('webkit', i) | 202 env.Alias('webkit', i) |
OLD | NEW |