Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(597)

Side by Side Diff: base/SConscript

Issue 2964: Use libevent, second try. Changes this time:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/DEPS ('k') | base/message_loop.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 env_tests = env.Clone() 8 env_tests = env.Clone()
9 9
10 env.Prepend( 10 env.Prepend(
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'sys_string_conversions_mac.cc', 152 'sys_string_conversions_mac.cc',
153 'worker_pool_mac.mm', 153 'worker_pool_mac.mm',
154 ]) 154 ])
155 155
156 if env['PLATFORM'] == 'posix': 156 if env['PLATFORM'] == 'posix':
157 input_files.extend([ 157 input_files.extend([
158 'atomicops_internals_x86_gcc.cc', 158 'atomicops_internals_x86_gcc.cc',
159 'base_paths_linux.cc', 159 'base_paths_linux.cc',
160 'file_util_linux.cc', 160 'file_util_linux.cc',
161 'hmac_nss.cc', 161 'hmac_nss.cc',
162 'message_pump_libevent.cc',
162 'nss_init.cc', 163 'nss_init.cc',
163 'sys_string_conversions_linux.cc', 164 'sys_string_conversions_linux.cc',
164 'worker_pool.cc', 165 'worker_pool.cc',
165 ]) 166 ])
166 167
167 env.ChromeStaticLibrary('base', input_files) 168 env.ChromeStaticLibrary('base', input_files)
168 169
169 170
170 env_tests.Prepend( 171 env_tests.Prepend(
171 CPPPATH = [ 172 CPPPATH = [
(...skipping 11 matching lines...) Expand all
183 CPPDEFINES = [ 184 CPPDEFINES = [
184 'UNIT_TEST', 185 'UNIT_TEST',
185 'PNG_USER_CONFIG', 186 'PNG_USER_CONFIG',
186 'CHROME_PNG_WRITE_SUPPORT', 187 'CHROME_PNG_WRITE_SUPPORT',
187 'U_STATIC_IMPLEMENTATION', 188 'U_STATIC_IMPLEMENTATION',
188 'GOOGLE_CHROME_BUILD', 189 'GOOGLE_CHROME_BUILD',
189 ], 190 ],
190 LIBS = [ 191 LIBS = [
191 'base', 192 'base',
192 'base_gfx', 193 'base_gfx',
194 'event',
193 'gtest', 195 'gtest',
194 'icuuc', 196 'icuuc',
195 'libpng', 197 'libpng',
196 'skia', 198 'skia',
197 'zlib', 199 'zlib',
198 ] 200 ]
199 ) 201 )
200 202
201 env_tests.Append( 203 env_tests.Append(
202 CPPPATH = [ 204 CPPPATH = [
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 env.Alias('base', ['.', installed_base_unittests, icudata]) 335 env.Alias('base', ['.', installed_base_unittests, icudata])
334 336
335 # TODO(sgk) should this be moved into base.lib like everything else? This will 337 # TODO(sgk) should this be moved into base.lib like everything else? This will
336 # require updating a bunch of other SConscripts which link directly against 338 # require updating a bunch of other SConscripts which link directly against
337 # this generated object file. 339 # this generated object file.
338 env_tests.StaticObject('perftimer.cc') 340 env_tests.StaticObject('perftimer.cc')
339 341
340 # Since run_all_perftests supplies a main, we cannot have it in base.lib 342 # Since run_all_perftests supplies a main, we cannot have it in base.lib
341 env_tests.StaticObject('run_all_perftests.cc') 343 env_tests.StaticObject('run_all_perftests.cc')
342 344
OLDNEW
« no previous file with comments | « base/DEPS ('k') | base/message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698