| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 declare_args() { | 5 declare_args() { | 
| 6   # Full path to the Windows SDK, not including a backslash at the end. | 6   # Full path to the Windows SDK, not including a backslash at the end. | 
| 7   windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.0" | 7   windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.0" | 
| 8 | 8 | 
| 9   # Full path to the Visual Studio installation, not including a backslash | 9   # Full path to the Visual Studio installation, not including a backslash | 
| 10   # at the end. | 10   # at the end. | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 37     "$windows_sdk_path\Include\shared", | 37     "$windows_sdk_path\Include\shared", | 
| 38     "$windows_sdk_path\Include\um", | 38     "$windows_sdk_path\Include\um", | 
| 39     "$windows_sdk_path\Include\winrt", | 39     "$windows_sdk_path\Include\winrt", | 
| 40     "$visual_studio_path\VC\include", | 40     "$visual_studio_path\VC\include", | 
| 41     "$visual_studio_path\VC\atlmfc\include", | 41     "$visual_studio_path\VC\atlmfc\include", | 
| 42   ] | 42   ] | 
| 43 } | 43 } | 
| 44 | 44 | 
| 45 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. | 45 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. | 
| 46 config("sdk_link") { | 46 config("sdk_link") { | 
| 47   # TODO(brettw) 64-bit. | 47   if (cpu_arch == "x64") { | 
| 48   is_64bit = false |  | 
| 49 |  | 
| 50   if (is_64bit) { |  | 
| 51     ldflags = [ "/MACHINE:X64" ] | 48     ldflags = [ "/MACHINE:X64" ] | 
| 52     lib_dirs = [ | 49     lib_dirs = [ | 
| 53       "$windows_sdk_path\Lib\win8\um\x64", | 50       "$windows_sdk_path\Lib\win8\um\x64", | 
| 54       "$visual_studio_path\VC\lib\amd64", | 51       "$visual_studio_path\VC\lib\amd64", | 
| 55       "$visual_studio_path\VC\atlmfc\lib\amd64", | 52       "$visual_studio_path\VC\atlmfc\lib\amd64", | 
| 56     ] | 53     ] | 
| 57   } else { | 54   } else { | 
| 58     ldflags = [ | 55     ldflags = [ | 
| 59       "/MACHINE:X86", | 56       "/MACHINE:X86", | 
| 60       "/SAFESEH",  # Not compatible with x64 so use only for x86. | 57       "/SAFESEH",  # Not compatible with x64 so use only for x86. | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 139 } | 136 } | 
| 140 | 137 | 
| 141 # Incremental linking ---------------------------------------------------------- | 138 # Incremental linking ---------------------------------------------------------- | 
| 142 | 139 | 
| 143 config("incremental_linking") { | 140 config("incremental_linking") { | 
| 144   ldflags = [ "/INCREMENTAL" ] | 141   ldflags = [ "/INCREMENTAL" ] | 
| 145 } | 142 } | 
| 146 config("no_incremental_linking") { | 143 config("no_incremental_linking") { | 
| 147   ldflags = [ "/INCREMENTAL:NO" ] | 144   ldflags = [ "/INCREMENTAL:NO" ] | 
| 148 } | 145 } | 
| OLD | NEW | 
|---|