summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 12:42:36 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 12:42:36 +0000
commit8b8832e0dff8ed9dc44b6210c393585183935979 (patch)
treef3dd0a2758d938e3491124c0a020ad8f1f1076ba /chrome/app
parent6289beb1a1caa052d9379923e2a7a344edb74839 (diff)
downloadchromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.zip
chromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.tar.gz
chromium_src-8b8832e0dff8ed9dc44b6210c393585183935979.tar.bz2
Convert tcmalloc (and its modified libcmt) to building with gyp.
BUG=none TEST=none Review URL: http://codereview.chromium.org/119265 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll.vcproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index 094962e..d8d57ac 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -56,7 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
+ AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib"
OutputFile="$(IntDir)\chrome.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="libcmtd.lib"
@@ -126,7 +126,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
+ AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib"
OutputFile="$(OutDir)\chrome.dll"
IgnoreDefaultLibraryNames="libcmt.lib"
ImportLibrary="$(OutDir)\lib\$(ProjectName).lib"