Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 22b570b5ed14d1e85f70c2d5b91aaab91e49eafb..b760583a5b98db4a93fb48462a57400e6c1e9190 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -922,6 +922,9 @@ |
}, { |
'directx_sdk_path%': '$(DXSDK_DIR)', |
}], |
+ ['OS=="win"', { |
+ 'windows_driver_kit_path%': '$(WDK_DIR)', |
+ }], |
# If use_official_google_api_keys is already set (to 0 or 1), we |
# do none of the implicit checking. If it is set to 1 and the |
# internal keys file is missing, the build will fail at compile |
@@ -1943,6 +1946,22 @@ |
'AdditionalLibraryDirectories': |
['<(windows_sdk_path)/Lib/win8/um/x64'], |
}, |
+ 'conditions': [ |
+ ['msvs_express', { |
+ 'VCLinkerTool': { |
+ 'AdditionalLibraryDirectories!': |
+ ['<(windows_driver_kit_path)/lib/ATL/i386'], |
+ 'AdditionalLibraryDirectories': |
+ ['<(windows_driver_kit_path)/lib/ATL/amd64'], |
+ }, |
+ 'VCLibrarianTool': { |
+ 'AdditionalLibraryDirectories!': |
+ ['<(windows_driver_kit_path)/lib/ATL/i386'], |
+ 'AdditionalLibraryDirectories': |
+ ['<(windows_driver_kit_path)/lib/ATL/amd64'], |
+ }, |
+ }], |
+ ], |
}, |
'defines': [ |
# Not sure if tcmalloc works on 64-bit Windows. |
@@ -3365,6 +3384,12 @@ |
'_SECURE_ATL', |
], |
}], |
+ ['msvs_express', { |
+ 'msvs_system_include_dirs': [ |
+ '<(windows_driver_kit_path)/inc/atl71', |
+ '<(windows_driver_kit_path)/inc/mfc42', |
scottmg
2012/10/17 18:26:20
we need the mfc headers but no libs?
alexeypa (please no reviews)
2012/10/17 22:17:03
Yes. The build fails without it. I haven't looked
|
+ ], |
+ }], |
], |
'msvs_system_include_dirs': [ |
'<(windows_sdk_path)/Include/shared', |
@@ -3405,6 +3430,13 @@ |
'<(directx_sdk_path)/Lib/x86', |
'<(windows_sdk_path)/Lib/win8/um/x86', |
], |
+ 'conditions': [ |
+ ['msvs_express', { |
+ 'AdditionalLibraryDirectories': [ |
+ '<(windows_driver_kit_path)/lib/ATL/i386', |
+ ], |
+ }], |
+ ], |
}, |
'VCLinkerTool': { |
'AdditionalDependencies': [ |
@@ -3426,6 +3458,9 @@ |
'AdditionalDependencies': [ |
'atlthunk.lib', |
], |
+ 'AdditionalLibraryDirectories': [ |
+ '<(windows_driver_kit_path)/lib/ATL/i386', |
+ ], |
# ATL 8.0 included in WDK 7.1 makes the linker to generate |
# almost eight hundred LNK4254 and LNK4078 warnings: |