| 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 os |    5 import os | 
|    6  |    6  | 
|    7 Import(['env']) |    7 Import(['env']) | 
|    8  |    8  | 
|    9 env_res = env.Clone() |    9 env_res = env.Clone() | 
|   10 env_test = env.Clone() |   10 env_test = env.Clone() | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   56       chrome_dll_res, |   56       chrome_dll_res, | 
|   57       common_res, |   57       common_res, | 
|   58       debugger_res, |   58       debugger_res, | 
|   59       net_res, |   59       net_res, | 
|   60       renderer_res, |   60       renderer_res, | 
|   61       webkit_res, |   61       webkit_res, | 
|   62   ] |   62   ] | 
|   63  |   63  | 
|   64 env_dll = env.Clone() |   64 env_dll = env.Clone() | 
|   65  |   65  | 
 |   66 env_dll.ApplySConscript([ | 
 |   67     '$CHROME_SRC_DIR/build/using_v8.scons', | 
 |   68 ]) | 
 |   69  | 
|   66 env_dll.Prepend( |   70 env_dll.Prepend( | 
|   67     CPPPATH = [ |   71     CPPPATH = [ | 
|   68         "..", |   72         "..", | 
|   69     ], |   73     ], | 
|   70     CPPDEFINES = [ |   74     CPPDEFINES = [ | 
|   71         'U_STATIC_IMPLEMENTATION', |   75         'U_STATIC_IMPLEMENTATION', | 
|   72         'PNG_USER_CONFIG', |   76         'PNG_USER_CONFIG', | 
|   73         'CHROME_PNG_WRITE_SUPPORT', |   77         'CHROME_PNG_WRITE_SUPPORT', | 
|   74         'GOOGLE_CHROME_BUILD', |   78         'GOOGLE_CHROME_BUILD', | 
|   75         'LIBXSLT_STATIC', |   79         'LIBXSLT_STATIC', | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  128         'common', |  132         'common', | 
|  129         'util', |  133         'util', | 
|  130         #'jscre', |  134         #'jscre', | 
|  131         'plugin', |  135         'plugin', | 
|  132         'renderer', |  136         'renderer', | 
|  133         'hunspell', |  137         'hunspell', | 
|  134         # TODO(sgk):  Windows doesn't use libevent, revisit when Linux gets here |  138         # TODO(sgk):  Windows doesn't use libevent, revisit when Linux gets here | 
|  135         #'libevent', |  139         #'libevent', | 
|  136         'sqlite', |  140         'sqlite', | 
|  137         'views', |  141         'views', | 
|  138         #'v8', |  | 
|  139         'v8_g', |  | 
|  140         'v8_snapshot', |  142         'v8_snapshot', | 
|  141     ], |  143     ], | 
|  142 ) |  144 ) | 
|  143  |  145  | 
|  144 if env_dll['PLATFORM'] == 'win32': |  146 if env_dll['PLATFORM'] == 'win32': | 
|  145   env_dll.Append( |  147   env_dll.Append( | 
|  146       LIBS = [ |  148       LIBS = [ | 
|  147           # TODO(sgk):  to be ported to Mac and Linux |  149           # TODO(sgk):  to be ported to Mac and Linux | 
|  148           'sdch', |  150           'sdch', | 
|  149  |  151  | 
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  410 ] |  412 ] | 
|  411  |  413  | 
|  412 # TODO(port) |  414 # TODO(port) | 
|  413 if env['PLATFORM'] == 'win32': |  415 if env['PLATFORM'] == 'win32': | 
|  414   env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) |  416   env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) | 
|  415  |  417  | 
|  416 env.Command('$DESTINATION_ROOT/resources/inspector', |  418 env.Command('$DESTINATION_ROOT/resources/inspector', | 
|  417             '$CHROME_SRC_DIR/webkit/port/page/inspector', |  419             '$CHROME_SRC_DIR/webkit/port/page/inspector', | 
|  418             Copy('$TARGET', '$SOURCE'), |  420             Copy('$TARGET', '$SOURCE'), | 
|  419             source_scanner=DirScanner) |  421             source_scanner=DirScanner) | 
| OLD | NEW |