Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props

Issue 14122017: [VS Addin] Add visual studio 2012 support (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .gitignore ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props
index 781803eb23d4ae1247e5b2aaa0325ab3b3a1072e..df595156d5f3eec47dada90a08b4213501c78876 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props
@@ -3,6 +3,10 @@
<ItemDefinitionGroup>
<ClCompile>
<ObjectFileName>$(IntDir)</ObjectFileName>
+ <TrackerLogDirectory Condition="'%(ClCompile.TrackerLogDirectory)' == ''">$(TLogLocation)</TrackerLogDirectory>
+ <ProgramDataBaseFileName Condition="'%(ClCompile.ProgramDataBaseFileName)' == '' and
+ '$(PlatformToolsetVersion)' != ''">$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName Condition="'%(ClCompile.ProgramDataBaseFileName)' == ''">$(IntDir)vc110.pdb</ProgramDataBaseFileName>
<PreprocessorDefinitions Condition="'%(ClCompile.PreprocessorDefinitions)' == ''"></PreprocessorDefinitions>
<Warnings Condition="'%(ClCompile.Warnings)' == ''">NormalWarnings</Warnings>
<WarningsAsErrors Condition="'%(ClCompile.WarningsAsErrors)' == ''">false</WarningsAsErrors>
@@ -32,6 +36,7 @@
<OutputFile>$(TargetDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories Condition="'%(Link.AdditionalLibraryDirectories)' == ''"></AdditionalLibraryDirectories>
<AdditionalDependencies Condition="'%(Link.AdditionalDependencies)' == ''"></AdditionalDependencies>
+ <TrackerLogDirectory Condition="'%(Link.TrackerLogDirectory)' == ''">$(TLogLocation)</TrackerLogDirectory>
<IgnoreAllDefaultLibraries Condition="'%(Link.IgnoreAllDefaultLibraries)' == ''">false</IgnoreAllDefaultLibraries>
<NaClSystemLibs Condition="'%(Link.NaClSystemLibs)' == ''">c;m;log;gcc</NaClSystemLibs>
<ReportUndefinedSymbols Condition="'%(Link.ReportUndefinedSymbols)' == ''">true</ReportUndefinedSymbols>
@@ -48,6 +53,7 @@
<Lib>
<OutputFile Condition="'%(Lib.OutputFile)' == ''">$(TargetDir)$(TargetName)$(TargetExt)</OutputFile>
<OutputCommandLine Condition="'%(Lib.OutputCommandLine)' == ''">false</OutputCommandLine>
+ <TrackerLogDirectory Condition="'%(Lib.TrackerLogDirectory)' == ''">$(TLogLocation)</TrackerLogDirectory>
</Lib>
</ItemDefinitionGroup>
« no previous file with comments | « .gitignore ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698