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 __doc__ = """ | 5 __doc__ = """ |
6 Configuration for building net.lib / libnet.a. | 6 Configuration for building net.lib / libnet.a. |
7 """ | 7 """ |
8 | 8 |
9 Import('env') | 9 Import('env') |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 'base/cert_status_flags.h', | 29 'base/cert_status_flags.h', |
30 'base/client_socket.h', | 30 'base/client_socket.h', |
31 'base/client_socket_factory.cc', | 31 'base/client_socket_factory.cc', |
32 'base/client_socket_factory.h', | 32 'base/client_socket_factory.h', |
33 'base/client_socket_handle.cc', | 33 'base/client_socket_handle.cc', |
34 'base/client_socket_handle.h', | 34 'base/client_socket_handle.h', |
35 'base/client_socket_pool.cc', | 35 'base/client_socket_pool.cc', |
36 'base/client_socket_pool.h', | 36 'base/client_socket_pool.h', |
37 'base/completion_callback.h', | 37 'base/completion_callback.h', |
38 'base/connection_type_histograms.cc', | 38 'base/connection_type_histograms.cc', |
| 39 'base/connection_type_histograms.h', |
39 'base/cookie_monster.cc', | 40 'base/cookie_monster.cc', |
40 'base/cookie_monster.h', | 41 'base/cookie_monster.h', |
41 'base/cookie_policy.cc', | 42 'base/cookie_policy.cc', |
42 'base/cookie_policy.h', | 43 'base/cookie_policy.h', |
43 'base/data_url.cc', | 44 'base/data_url.cc', |
44 'base/data_url.h', | 45 'base/data_url.h', |
45 'base/directory_lister.cc', | 46 'base/directory_lister.cc', |
46 'base/directory_lister.h', | 47 'base/directory_lister.h', |
47 'base/dns_resolution_observer.cc', | 48 'base/dns_resolution_observer.cc', |
48 'base/dns_resolution_observer.h', | 49 'base/dns_resolution_observer.h', |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 env['PCH'] = pch | 330 env['PCH'] = pch |
330 env['PCHSTOP'] = 'precompiled_net.h' | 331 env['PCHSTOP'] = 'precompiled_net.h' |
331 env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h']) | 332 env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h']) |
332 input_files.Replace('build/precompiled_net.cc', obj) | 333 input_files.Replace('build/precompiled_net.cc', obj) |
333 | 334 |
334 lib = env.ChromeLibrary('net', input_files) | 335 lib = env.ChromeLibrary('net', input_files) |
335 | 336 |
336 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj', | 337 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj', |
337 dest='$CHROME_SRC_DIR/net/build/net.vcproj', | 338 dest='$CHROME_SRC_DIR/net/build/net.vcproj', |
338 guid='{326E9795-E760-410A-B69A-3F79DB3F5243}', | 339 guid='{326E9795-E760-410A-B69A-3F79DB3F5243}', |
| 340 keyword='Win32Proj', |
339 dependencies = [ | 341 dependencies = [ |
340 '$NET_DIR/build/net_resources.vcproj', | 342 '$NET_DIR/build/net_resources.vcproj', |
341 '$NET_DIR/build/tld_cleanup.vcproj', | 343 '$NET_DIR/build/tld_cleanup.vcproj', |
342 ], | 344 ], |
343 # TODO: restore when we can derive all info, | 345 # TODO: restore when we can derive all info, |
344 # on all platforms, from the windows build targets. | 346 # on all platforms, from the windows build targets. |
345 #buildtargets=[lib[0]], | 347 #buildtargets=[lib[0]], |
346 files=input_files, | 348 files=input_files, |
347 ConfigurationType='4') | 349 ConfigurationType='4') |
348 | 350 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 UsePrecompiledHeader='1'), | 409 UsePrecompiledHeader='1'), |
408 ]) | 410 ]) |
409 | 411 |
410 # TODO(sgk): remove when we can derive this information | 412 # TODO(sgk): remove when we can derive this information |
411 p.AddFileConfig('build/precompiled_net.cc', | 413 p.AddFileConfig('build/precompiled_net.cc', |
412 'Release|Win32', | 414 'Release|Win32', |
413 ExcludedFromBuild='true', | 415 ExcludedFromBuild='true', |
414 tools=[ | 416 tools=[ |
415 'VCCLCompilerTool', | 417 'VCCLCompilerTool', |
416 ]) | 418 ]) |
OLD | NEW |