diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 11:37:01 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 11:37:01 +0000 |
| commit | 1543aa2584cc0f3fefd2267cfd42251809afe152 (patch) | |
| tree | 43e6413e57e63dc5d892fca1f0f4da682a846cef /chrome/app/chrome_dll.vcproj | |
| parent | abafb0bf768ed3c903bbfdf0a509c3ca869eb3c9 (diff) | |
| download | chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.zip chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.tar.gz chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.tar.bz2 | |
Rolling back webkit-gyp switch. r14382
Review URL: http://codereview.chromium.org/99182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll.vcproj')
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index d22b95c..a232cf0 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\lib\tcmalloc.lib" + AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib" OutputFile="$(IntDir)\chrome.dll" LinkIncremental="1" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -230,7 +230,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc" > </File> <File |