diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 14:44:07 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 14:44:07 +0000 |
| commit | d2359559618e7aad5fb2b98cbd9a06420fe89c5c (patch) | |
| tree | be0a8f5639e41ff1e0197459a7c583906664bc13 /third_party | |
| parent | 59c04dfb83765c03e8d97fe9052cde4235a198e5 (diff) | |
| download | chromium_src-d2359559618e7aad5fb2b98cbd9a06420fe89c5c.zip chromium_src-d2359559618e7aad5fb2b98cbd9a06420fe89c5c.tar.gz chromium_src-d2359559618e7aad5fb2b98cbd9a06420fe89c5c.tar.bz2 | |
make sure we don't include the obsolete 2008 SDK dir.
This is making the nacl 64 app to fail to build, because our code
to make sure we use the lib64 folder fails because it does not except
to have the sdk Lib dir twice (once for 2008, once for win7).
Review URL: http://codereview.chromium.org/660314
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 | ||||
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 1af1668..db0f5bd 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -38,7 +38,7 @@ 'conditions': [ ['OS=="win"', { 'include_dirs': [ - '../third_party/platformsdk_win2008_6_1/files/Include', + '../third_party/platformsdk_win7/files/Include', ], }], ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index 08f163d..8c86b3d 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -143,7 +143,7 @@ 'VCLibrarianTool=': { 'AdditionalOptions': ['/ignore:4006,4221'], 'AdditionalLibraryDirectories': - ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], }, 'VCLinkerTool': { 'AdditionalOptions': ['/ignore:4006'], |