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

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

Issue 809783002: Fix ui/gl and gpu target building with GN on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and remove usage of system_include_dirs. Created 6 years 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.gn ('k') | build/config/win/visual_studio_version.gni » ('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=0x06030000", 16 "NTDDI_VERSION=0x06030000",
17 "PSAPI_VERSION=1", 17 "PSAPI_VERSION=1",
18 "WIN32", 18 "WIN32",
19 "_SECURE_ATL", 19 "_SECURE_ATL",
20 ] 20 ]
21
22 include_dirs = system_include_dirs
23 } 21 }
24 22
25 # Sets the default Windows build version. This is separated because some 23 # Sets the default Windows build version. This is separated because some
26 # targets need to manually override it for their compiles. 24 # targets need to manually override it for their compiles.
27 config("winver") { 25 config("winver") {
28 defines = [ 26 defines = [
29 "_WIN32_WINNT=0x0603", 27 "_WIN32_WINNT=0x0603",
30 "WINVER=0x0603", 28 "WINVER=0x0603",
31 ] 29 ]
32 } 30 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 125
128 # Nominmax -------------------------------------------------------------------- 126 # Nominmax --------------------------------------------------------------------
129 127
130 # Some third party code defines NOMINMAX before including windows.h, which 128 # Some third party code defines NOMINMAX before including windows.h, which
131 # then causes warnings when it's been previously defined on the command line. 129 # then causes warnings when it's been previously defined on the command line.
132 # For such targets, this config can be removed. 130 # For such targets, this config can be removed.
133 131
134 config("nominmax") { 132 config("nominmax") {
135 defines = [ "NOMINMAX" ] 133 defines = [ "NOMINMAX" ]
136 } 134 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | build/config/win/visual_studio_version.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698