| 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 if env['PLATFORM'] == 'win32': | 10 if env['PLATFORM'] == 'win32': |
| 11 env_res.Append( | 11 env_res.Append( |
| 12 CPPPATH = [ | 12 CPPPATH = [ |
| 13 '.', | 13 '.', |
| 14 '$CHROME_SRC_DIR', | 14 '$CHROME_SRC_DIR', |
| 15 '$NET_DIR', | 15 '$NET_DIR', |
| 16 ], | 16 ], |
| 17 RCFLAGS = [ | 17 RCFLAGS = [ |
| 18 ['/l', '0x409'], | 18 ['/l', '0x409'], |
| 19 ], | 19 ], |
| 20 ) | 20 ) |
| 21 | 21 |
| 22 env.Append( | 22 env.Append( |
| 23 CPPPATH = [ | 23 CPPPATH = [ |
| 24 '$BREAKPAD_DIR/src', | 24 '$BREAKPAD_DIR/src', |
| 25 '$WEBKIT_DIR/glue', | 25 '$WEBKIT_DIR/glue', |
| 26 '$GTEST_DIR/include', | 26 '$GTEST_DIR/include', |
| 27 ], | 27 ], |
| 28 LIBS = [ | 28 LIBS = [ |
| 29 'dmg_fp', |
| 29 'test_shell', | 30 'test_shell', |
| 30 'glue', | 31 'glue', |
| 31 'port', | 32 'port', |
| 32 'base', | 33 'base', |
| 33 'base_gfx', | 34 'base_gfx', |
| 34 'breakpad_handler', | 35 'breakpad_handler', |
| 35 'googleurl', | 36 'googleurl', |
| 36 'net', | 37 'net', |
| 37 'sdch', | 38 'sdch', |
| 38 'skia', | 39 'skia', |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 # Commented out until a regression is fixed and this file is restored. | 191 # Commented out until a regression is fixed and this file is restored. |
| 191 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 192 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', |
| 192 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 193 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', |
| 193 ]) | 194 ]) |
| 194 | 195 |
| 195 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 196 test_shell_tests = env.ChromeTestProgram('test_shell_tests', |
| 196 resources + test_files) | 197 resources + test_files) |
| 197 i = env.Install('$TARGET_ROOT', test_shell_tests) | 198 i = env.Install('$TARGET_ROOT', test_shell_tests) |
| 198 env.Alias('webkit', i) | 199 env.Alias('webkit', i) |
| 199 | 200 |
| OLD | NEW |