| 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. |
| 11 | 11 |
| 12 defines = [ | 12 defines = [ |
| 13 "_ATL_NO_OPENGL", | 13 "_ATL_NO_OPENGL", |
| 14 "_WIN32_WINNT=0x0602", | 14 "_WIN32_WINNT=0x0602", |
| 15 "_WINDOWS", | 15 "_WINDOWS", |
| 16 "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS", | 16 "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS", |
| 17 "NTDDI_VERSION=0x06020000", | 17 "NTDDI_VERSION=0x06020000", |
| 18 "PSAPI_VERSION=1", | 18 "PSAPI_VERSION=1", |
| 19 "WIN32", | 19 "WIN32", |
| 20 "WINVER=0x0602", | 20 "WINVER=0x0602", |
| 21 ] | 21 ] |
| 22 | 22 |
| 23 # The Windows SDK include directories must be first. They both have a sal.h, | 23 include_dirs = system_include_dirs |
| 24 # and the SDK one is newer and the SDK uses some newer features from it not | |
| 25 # present in the Visual Studio one. | |
| 26 include_dirs = [ | |
| 27 "$windows_sdk_path\Include\shared", | |
| 28 "$windows_sdk_path\Include\um", | |
| 29 "$windows_sdk_path\Include\winrt", | |
| 30 "$visual_studio_path\VC\include", | |
| 31 "$visual_studio_path\VC\atlmfc\include", | |
| 32 ] | |
| 33 | 24 |
| 34 if (is_visual_studio_express) { | 25 if (is_visual_studio_express) { |
| 35 include_dirs += [ | |
| 36 "$wdk_path/inc/atl71", | |
| 37 "$wdk_path/inc/mfc42", | |
| 38 ] | |
| 39 | |
| 40 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 | 26 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 |
| 41 # Warning 4702 ("Unreachable code") should be re-enabled once Express users | 27 # Warning 4702 ("Unreachable code") should be re-enabled once Express users |
| 42 # are updated to VS2013 Update 2. | 28 # are updated to VS2013 Update 2. |
| 43 cflags = [ "/wd4702" ] | 29 cflags = [ "/wd4702" ] |
| 44 } else { | 30 } else { |
| 45 # Only supported on non-Express versions. | 31 # Only supported on non-Express versions. |
| 46 defines += [ "_SECURE_ATL" ] | 32 defines += [ "_SECURE_ATL" ] |
| 47 } | 33 } |
| 48 } | 34 } |
| 49 | 35 |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 152 |
| 167 # Some third party code defines NOMINMAX before including windows.h, which | 153 # Some third party code defines NOMINMAX before including windows.h, which |
| 168 # then causes warnings when it's been previously defined on the command line. | 154 # then causes warnings when it's been previously defined on the command line. |
| 169 # For such targets, this config can be removed. | 155 # For such targets, this config can be removed. |
| 170 | 156 |
| 171 config("nominmax") { | 157 config("nominmax") { |
| 172 defines = [ | 158 defines = [ |
| 173 "NOMINMAX", | 159 "NOMINMAX", |
| 174 ] | 160 ] |
| 175 } | 161 } |
| OLD | NEW |