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

Unified Diff: tools/gn/secondary/build/config/win/BUILD.gn

Issue 26561005: GYP generator for GN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/secondary/build/config/BUILDCONFIG.gn ('k') | tools/gn/secondary/chrome/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/build/config/win/BUILD.gn
diff --git a/tools/gn/secondary/build/config/win/BUILD.gn b/tools/gn/secondary/build/config/win/BUILD.gn
index dee1be64946c756b5ec24ecb1b374607866f099b..efdc5ab289bcc1a28f830a271f7453d4087113d1 100644
--- a/tools/gn/secondary/build/config/win/BUILD.gn
+++ b/tools/gn/secondary/build/config/win/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-win_sdk_dir = "C:\Program Files (x86)\Windows Kits\8.0"
+declare_args() {
+ windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.0"
+}
# Compiler setup for the Windows SDK. Applied to all targets.
config("sdk") {
@@ -24,9 +26,9 @@ config("sdk") {
]
include_dirs = [
- "$win_sdk_dir\Include\shared",
- "$win_sdk_dir\Include\um",
- "$win_sdk_dir\Include\winrt",
+ "$windows_sdk_path\Include\shared",
+ "$windows_sdk_path\Include\um",
+ "$windows_sdk_path\Include\winrt",
]
}
@@ -37,13 +39,13 @@ config("sdk_link") {
if (is_64bit) {
ldflags = [ "/MACHINE:X64" ]
- libs = [ "$win_sdk_dir\Lib\win8\um\x64" ]
+ libs = [ "$windows_sdk_path\Lib\win8\um\x64" ]
} else {
ldflags = [
"/MACHINE:X86",
"/SAFESEH", # Not compatible with x64 so use only for x86.
]
- lib_dirs = [ "$win_sdk_dir\Lib\win8\um\x86" ]
+ lib_dirs = [ "$windows_sdk_path\Lib\win8\um\x86" ]
#if (!is_asan) { TODO(brettw) Address Sanitizer
# ldflags += "/largeaddressaware"
« no previous file with comments | « tools/gn/secondary/build/config/BUILDCONFIG.gn ('k') | tools/gn/secondary/chrome/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698