| Index: net/net_perftests.scons
 | 
| ===================================================================
 | 
| --- net/net_perftests.scons	(revision 5681)
 | 
| +++ net/net_perftests.scons	(working copy)
 | 
| @@ -10,51 +10,25 @@
 | 
|  
 | 
|  env = env.Clone()
 | 
|  
 | 
| -env.SConscript([
 | 
| -    # On Linux, dependencies must follow dependents, so...
 | 
| -    # 1) net must come before base and modp_b64.
 | 
| -    # 2) bzip2 must come before base.
 | 
| -    '$NET_DIR/using_net.scons',
 | 
| -
 | 
| +env.ApplySConscript([
 | 
|      '$BASE_DIR/using_base.scons',
 | 
|      '$CHROME_SRC_DIR/build/using_googleurl.scons',
 | 
|      '$GTEST_DIR/../using_gtest.scons',
 | 
|      '$ICU38_DIR/using_icu38.scons',
 | 
|      '$MODP_B64_DIR/using_modp_b64.scons',
 | 
| -], {'env':env})
 | 
| +    '$NET_DIR/using_net.scons',
 | 
| +])
 | 
|  
 | 
|  if env['PLATFORM'] in ('posix', 'darwin'):
 | 
|    env.SConscript([
 | 
|        '$LIBEVENT_DIR/using_libevent.scons',
 | 
|    ], {'env':env})
 | 
|  
 | 
| -env.Prepend(
 | 
| -    CPPPATH = [
 | 
| -        '$CHROME_SRC_DIR',
 | 
| -    ],
 | 
| -)
 | 
| -
 | 
|  if env['PLATFORM'] == 'win32':
 | 
|    env.Prepend(
 | 
|        CCFLAGS = [
 | 
| -          '/TP',
 | 
|            '/WX',
 | 
|        ],
 | 
| -      CPPDEFINES = [
 | 
| -          '_WIN32_WINNT=0x0600',
 | 
| -          'WINVER=0x0600',
 | 
| -          '_HAS_EXCEPTIONS=0',
 | 
| -      ],
 | 
| -      LINKFLAGS = [
 | 
| -          '/DELAYLOAD:"dwmapi.dll"',
 | 
| -          '/DELAYLOAD:"uxtheme.dll"',
 | 
| -          '/MACHINE:X86',
 | 
| -          '/FIXED:No',
 | 
| -          '/safeseh',
 | 
| -          '/dynamicbase',
 | 
| -          '/ignore:4199',
 | 
| -          '/nxcompat',
 | 
| -      ],
 | 
|    )
 | 
|  elif env['PLATFORM'] == 'posix':
 | 
|    env.Append(
 | 
| 
 |