| Index: build/config/win/BUILD.gn
|
| diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
|
| index d1f670e9fb180c06f133119c61423a303b83f9f2..daa07741c8eb5887a7a4002a276db0b48e822b29 100644
|
| --- a/build/config/win/BUILD.gn
|
| +++ b/build/config/win/BUILD.gn
|
| @@ -84,6 +84,7 @@ config("compiler") {
|
| config("runtime_library") {
|
| cflags = []
|
|
|
| + # Defines that set up the CRT.
|
| defines = [
|
| "__STD_C",
|
| "_CRT_RAND_S",
|
| @@ -92,6 +93,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
|
| @@ -120,25 +135,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") {
|
|
|