| 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') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.Prepend( | 9 env.Prepend( |
| 10 CPPPATH = [ | 10 CPPPATH = [ |
| 11 '$NPAPI_DIR', | 11 '$NPAPI_DIR', |
| 12 '$CHROME_SRC_DIR', | 12 '$CHROME_SRC_DIR', |
| 13 ], | 13 ], |
| 14 LIBS = [ | 14 LIBS = [ |
| 15 'activex_shim', | 15 'activex_shim', |
| 16 'googleurl', | 16 'googleurl', |
| 17 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed | 17 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed |
| 18 'base', | 18 'base', |
| 19 'dmg_fp', |
| 19 ], | 20 ], |
| 20 ) | 21 ) |
| 21 | 22 |
| 22 env.Append( | 23 env.Append( |
| 23 LINKFLAGS = [ | 24 LINKFLAGS = [ |
| 24 '/INCREMENTAL', | 25 '/INCREMENTAL', |
| 25 | 26 |
| 26 '/MANIFEST', | 27 '/MANIFEST', |
| 27 '/DELAYLOAD:"dwmapi.dll"', | 28 '/DELAYLOAD:"dwmapi.dll"', |
| 28 '/DELAYLOAD:"uxtheme.dll"', | 29 '/DELAYLOAD:"uxtheme.dll"', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 40 | 41 |
| 41 input_files = [ | 42 input_files = [ |
| 42 'activex_shim_dll.cc', | 43 'activex_shim_dll.cc', |
| 43 'activex_shim_dll.def', | 44 'activex_shim_dll.def', |
| 44 ] | 45 ] |
| 45 | 46 |
| 46 dll = env.ChromeSharedLibrary('npaxshim', input_files) | 47 dll = env.ChromeSharedLibrary('npaxshim', input_files) |
| 47 i = env.Install('$TARGET_ROOT', dll) | 48 i = env.Install('$TARGET_ROOT', dll) |
| 48 env.Alias('webkit', i) | 49 env.Alias('webkit', i) |
| 49 | 50 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10868:
fix scons webkit build on windows (Closed)
