| 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 import("//build/config/win/visual_studio_version.gni") | 5 import("//build/config/win/visual_studio_version.gni") |
| 6 | 6 |
| 7 # Compiler setup for the Windows SDK. Applied to all targets. | 7 # Compiler setup for the Windows SDK. Applied to all targets. |
| 8 config("sdk") { | 8 config("sdk") { |
| 9 # The include path is the stuff returned by the script. | 9 # The include path is the stuff returned by the script. |
| 10 #include_dirs = msvc_config[0] TODO(brettw) make this work. | 10 #include_dirs = msvc_config[0] TODO(brettw) make this work. |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 "_WIN32_WINNT=0x0603", | 38 "_WIN32_WINNT=0x0603", |
| 39 "WINVER=0x0603", | 39 "WINVER=0x0603", |
| 40 ] | 40 ] |
| 41 } | 41 } |
| 42 | 42 |
| 43 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. | 43 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. |
| 44 config("sdk_link") { | 44 config("sdk_link") { |
| 45 if (cpu_arch == "x64") { | 45 if (cpu_arch == "x64") { |
| 46 ldflags = [ "/MACHINE:X64" ] | 46 ldflags = [ "/MACHINE:X64" ] |
| 47 lib_dirs = [ | 47 lib_dirs = [ |
| 48 "$windows_sdk_path\Lib\win8\um\x64", | 48 "$windows_sdk_path\Lib\winv6.3\um\x64", |
| 49 "$visual_studio_path\VC\lib\amd64", | 49 "$visual_studio_path\VC\lib\amd64", |
| 50 "$visual_studio_path\VC\atlmfc\lib\amd64", | 50 "$visual_studio_path\VC\atlmfc\lib\amd64", |
| 51 ] | 51 ] |
| 52 if (is_visual_studio_express) { | 52 if (is_visual_studio_express) { |
| 53 lib_dirs += [ "$wdk_path/lib/ATL/amd64" ] | 53 lib_dirs += [ "$wdk_path/lib/ATL/amd64" ] |
| 54 } | 54 } |
| 55 } else { | 55 } else { |
| 56 ldflags = [ | 56 ldflags = [ |
| 57 "/MACHINE:X86", | 57 "/MACHINE:X86", |
| 58 "/SAFESEH", # Not compatible with x64 so use only for x86. | 58 "/SAFESEH", # Not compatible with x64 so use only for x86. |
| 59 ] | 59 ] |
| 60 lib_dirs = [ | 60 lib_dirs = [ |
| 61 "$windows_sdk_path\Lib\win8\um\x86", | 61 "$windows_sdk_path\Lib\winv6.3\um\x86", |
| 62 "$visual_studio_path\VC\lib", | 62 "$visual_studio_path\VC\lib", |
| 63 "$visual_studio_path\VC\atlmfc\lib", | 63 "$visual_studio_path\VC\atlmfc\lib", |
| 64 ] | 64 ] |
| 65 if (is_visual_studio_express) { | 65 if (is_visual_studio_express) { |
| 66 lib_dirs += [ "$wdk_path/lib/ATL/i386" ] | 66 lib_dirs += [ "$wdk_path/lib/ATL/i386" ] |
| 67 } | 67 } |
| 68 if (!is_asan) { | 68 if (!is_asan) { |
| 69 ldflags += [ "/largeaddressaware" ] | 69 ldflags += [ "/largeaddressaware" ] |
| 70 } | 70 } |
| 71 } | 71 } |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 # Some third party code defines NOMINMAX before including windows.h, which | 160 # Some third party code defines NOMINMAX before including windows.h, which |
| 161 # then causes warnings when it's been previously defined on the command line. | 161 # then causes warnings when it's been previously defined on the command line. |
| 162 # For such targets, this config can be removed. | 162 # For such targets, this config can be removed. |
| 163 | 163 |
| 164 config("nominmax") { | 164 config("nominmax") { |
| 165 defines = [ | 165 defines = [ |
| 166 "NOMINMAX", | 166 "NOMINMAX", |
| 167 ] | 167 ] |
| 168 } | 168 } |
| OLD | NEW |