Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: build/config/win/BUILD.gn

Issue 720033003: Update to VS2013 Update 4, and Windows SDK 8.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ntddi Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | build/get_landmines.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "_WINDOWS", 14 "_WINDOWS",
15 "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS", 15 "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
16 "NTDDI_VERSION=0x06020000", 16 "NTDDI_VERSION=0x06030000",
17 "PSAPI_VERSION=1", 17 "PSAPI_VERSION=1",
18 "WIN32", 18 "WIN32",
19 ] 19 ]
20 20
21 include_dirs = system_include_dirs 21 include_dirs = system_include_dirs
22 22
23 if (is_visual_studio_express) { 23 if (is_visual_studio_express) {
24 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 24 # https://code.google.com/p/chromium/issues/detail?id=372451#c20
25 # Warning 4702 ("Unreachable code") should be re-enabled once Express users 25 # Warning 4702 ("Unreachable code") should be re-enabled once Express users
26 # are updated to VS2013 Update 2. 26 # are updated to VS2013 Update 2.
27 cflags = [ "/wd4702" ] 27 cflags = [ "/wd4702" ]
28 } else { 28 } else {
29 # Only supported on non-Express versions. 29 # Only supported on non-Express versions.
30 defines += [ "_SECURE_ATL" ] 30 defines += [ "_SECURE_ATL" ]
31 } 31 }
32 } 32 }
33 33
34 # Sets the default Windows build version. This is separated because some 34 # Sets the default Windows build version. This is separated because some
35 # targets need to manually override it for their compiles. 35 # targets need to manually override it for their compiles.
36 config("winver") { 36 config("winver") {
37 defines = [ 37 defines = [
38 "_WIN32_WINNT=0x0602", 38 "_WIN32_WINNT=0x0603",
39 "WINVER=0x0602", 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\win8\um\x64",
49 "$visual_studio_path\VC\lib\amd64", 49 "$visual_studio_path\VC\lib\amd64",
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/get_landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698