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

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

Issue 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes
Patch Set: merge to #317214 Created 5 years, 10 months 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
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.
(...skipping 13 matching lines...) Expand all
24 # targets need to manually override it for their compiles. 24 # targets need to manually override it for their compiles.
25 config("winver") { 25 config("winver") {
26 defines = [ 26 defines = [
27 "_WIN32_WINNT=0x0603", 27 "_WIN32_WINNT=0x0603",
28 "WINVER=0x0603", 28 "WINVER=0x0603",
29 ] 29 ]
30 } 30 }
31 31
32 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. 32 # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs.
33 config("sdk_link") { 33 config("sdk_link") {
34 if (cpu_arch == "x64") { 34 if (current_cpu == "x64") {
35 ldflags = [ "/MACHINE:X64" ] 35 ldflags = [ "/MACHINE:X64" ]
36 lib_dirs = [ 36 lib_dirs = [
37 "$windows_sdk_path\Lib\winv6.3\um\x64", 37 "$windows_sdk_path\Lib\winv6.3\um\x64",
38 "$visual_studio_path\VC\lib\amd64", 38 "$visual_studio_path\VC\lib\amd64",
39 "$visual_studio_path\VC\atlmfc\lib\amd64", 39 "$visual_studio_path\VC\atlmfc\lib\amd64",
40 ] 40 ]
41 } else { 41 } else {
42 ldflags = [ 42 ldflags = [
43 "/MACHINE:X86", 43 "/MACHINE:X86",
44 "/SAFESEH", # Not compatible with x64 so use only for x86. 44 "/SAFESEH", # Not compatible with x64 so use only for x86.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 # Nominmax -------------------------------------------------------------------- 132 # Nominmax --------------------------------------------------------------------
133 133
134 # Some third party code defines NOMINMAX before including windows.h, which 134 # Some third party code defines NOMINMAX before including windows.h, which
135 # then causes warnings when it's been previously defined on the command line. 135 # then causes warnings when it's been previously defined on the command line.
136 # For such targets, this config can be removed. 136 # For such targets, this config can be removed.
137 137
138 config("nominmax") { 138 config("nominmax") {
139 defines = [ "NOMINMAX" ] 139 defines = [ "NOMINMAX" ]
140 } 140 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698