| 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_test') | 5 Import('env', 'env_test') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.Prepend( | 9 env.Prepend( |
| 10 CPPPATH = [ | 10 CPPPATH = [ |
| 11 '$CHROME_DIR/app/resources', | 11 '$CHROME_DIR/app/resources', |
| 12 '#/tools/build/win', | 12 '#/tools/build/win', |
| 13 '#/..', | 13 '$CHROME_SRC_DIR', |
| 14 ], | 14 ], |
| 15 CPPDEFINES = [ | 15 CPPDEFINES = [ |
| 16 'U_STATIC_IMPLEMENTATION', | 16 'U_STATIC_IMPLEMENTATION', |
| 17 ], | 17 ], |
| 18 ) | 18 ) |
| 19 | 19 |
| 20 if env['PLATFORM'] == 'win32': | 20 if env['PLATFORM'] == 'win32': |
| 21 env.Prepend( | 21 env.Prepend( |
| 22 CCFLAGS = [ | 22 CCFLAGS = [ |
| 23 '/TP', | 23 '/TP', |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 env.ChromeStaticLibrary('common', input_files) | 124 env.ChromeStaticLibrary('common', input_files) |
| 125 | 125 |
| 126 | 126 |
| 127 env_test = env_test.Clone() | 127 env_test = env_test.Clone() |
| 128 | 128 |
| 129 env_test.Append( | 129 env_test.Append( |
| 130 CPPPATH = [ | 130 CPPPATH = [ |
| 131 '$SKIA_DIR/include', | 131 '$SKIA_DIR/include', |
| 132 '$SKIA_DIR/include/corecg', | 132 '$SKIA_DIR/include/corecg', |
| 133 '$SKIA_DIR/platform', | 133 '$SKIA_DIR/platform', |
| 134 '#/..', | 134 '$CHROME_SRC_DIR', |
| 135 '$GTEST_DIR/include', | 135 '$GTEST_DIR/include', |
| 136 ], | 136 ], |
| 137 LIBS = [ | 137 LIBS = [ |
| 138 'base', | 138 'base', |
| 139 'gtest', | 139 'gtest', |
| 140 env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed | 140 env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed |
| 141 ], | 141 ], |
| 142 ) | 142 ) |
| 143 | 143 |
| 144 if env_test['PLATFORM'] == 'win32': | 144 if env_test['PLATFORM'] == 'win32': |
| (...skipping 30 matching lines...) Expand all Loading... |
| 175 | 175 |
| 176 libs = [ | 176 libs = [ |
| 177 'common.lib', | 177 'common.lib', |
| 178 ] | 178 ] |
| 179 | 179 |
| 180 ipc_tests = env_test.ChromeTestProgram('ipc_tests', ipc_tests_files + libs) | 180 ipc_tests = env_test.ChromeTestProgram('ipc_tests', ipc_tests_files + libs) |
| 181 | 181 |
| 182 i = env_test.Install('$TARGET_ROOT', ipc_tests) | 182 i = env_test.Install('$TARGET_ROOT', ipc_tests) |
| 183 Alias('chrome', i) | 183 Alias('chrome', i) |
| 184 | 184 |
| OLD | NEW |