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

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

Issue 1367403002: Remove the GN *sdk targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« build/config/mac/BUILD.gn ('K') | « build/config/posix/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/win/BUILD.gn
diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
index a93ed30daa3cfa23bc18911b193eb64dbccf1482..b388505d046896f954f5f772ea2c1644ed7ac904 100644
--- a/build/config/win/BUILD.gn
+++ b/build/config/win/BUILD.gn
@@ -76,6 +76,7 @@ config("compiler") {
config("runtime_library") {
cflags = []
+ # Defines that set up the CRT.
defines = [
"__STD_C",
"_CRT_RAND_S",
@@ -84,6 +85,20 @@ config("runtime_library") {
"_SCL_SECURE_NO_DEPRECATE",
]
+ # Defines that set up the Windows SDK.
+ defines += [
+ "_ATL_NO_OPENGL",
+ "_WINDOWS",
+ "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
+ "NTDDI_VERSION=0x06030000",
+ "PSAPI_VERSION=1",
+ "WIN32",
+ "_SECURE_ATL",
+
+ # This is required for ATL to use XP-safe versions of its functions.
+ "_USING_V110_SDK71_",
+ ]
+
if (is_component_build) {
# Component mode: dynamic CRT. Since the library is shared, it requires
# exceptions or will give errors about things not matching, so keep
@@ -112,25 +127,6 @@ config("runtime_library") {
}
}
-# Compiler setup for the Windows SDK. Applied to all targets.
-config("sdk") {
- # The include path is the stuff returned by the script.
- #include_dirs = msvc_config[0] TODO(brettw) make this work.
-
- defines = [
- "_ATL_NO_OPENGL",
- "_WINDOWS",
- "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
- "NTDDI_VERSION=0x06030000",
- "PSAPI_VERSION=1",
- "WIN32",
- "_SECURE_ATL",
-
- # This is required for ATL to use XP-safe versions of its functions.
- "_USING_V110_SDK71_",
- ]
-}
-
# Sets the default Windows build version. This is separated because some
# targets need to manually override it for their compiles.
config("winver") {
« build/config/mac/BUILD.gn ('K') | « build/config/posix/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698