diff options
| author | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com> | 2015-03-06 20:12:00 +0000 |
|---|---|---|
| committer | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com> | 2015-03-06 20:12:00 +0000 |
| commit | bbd478ae733777807b2d3aebaa27e488554a8352 (patch) | |
| tree | d663a8ddc6aef2976d4cb9b387d1a231f18fe90f | |
| parent | Formatting tweak for https://breakpad.appspot.com/9774002, add more newlines (diff) | |
| download | breakpad-bbd478ae733777807b2d3aebaa27e488554a8352.tar.xz | |
Fix Windows dump_syms x64 linking
The dia_sdk GYP target points at the x86 diaguids.lib, it needs to
point at the x64 one for x64 builds.
R=mark at https://breakpad.appspot.com/9784002/
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1431 4c0a9323-5329-0410-9bdc-e9ce6186880e
| -rw-r--r-- | src/common/windows/common_windows.gyp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/common/windows/common_windows.gyp b/src/common/windows/common_windows.gyp index aadc21a7..c98333a3 100644 --- a/src/common/windows/common_windows.gyp +++ b/src/common/windows/common_windows.gyp @@ -37,16 +37,34 @@ 'all_dependent_settings': { 'include_dirs': [ '<(DEPTH)', - '$(VSInstallDir)\DIA SDK\include', + '$(VSInstallDir)/DIA SDK/include', ], 'msvs_settings': { 'VCLinkerTool': { 'AdditionalDependencies': [ - '$(VSInstallDir)\DIA SDK\lib\diaguids.lib', + 'diaguids.lib', 'imagehlp.lib', ], }, }, + 'configurations': { + 'x86_Base': { + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalLibraryDirectories': + ['$(VSInstallDir)/DIA SDK/lib'], + }, + }, + }, + 'x64_Base': { + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalLibraryDirectories': + ['$(VSInstallDir)/DIA SDK/lib/amd64'], + }, + }, + }, + }, }, }, { |