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

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props

Issue 11358127: Honor toolchain name in output folder (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 1 month 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
Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
index ccb286407ac1f6ac41482af43208207fe68d8288..82c05b1c448d5d1bb45ef2f9ae7e231d99c0cd57 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
@@ -5,6 +5,8 @@
<PropertyGroup>
<DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</DebuggerFlavor>
+ <IntDir Condition="'$(IntDir)'=='DUMMY'">$(Platform)\$(ToolchainName)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(OutDir)'=='DUMMY'">$(ProjectDir)$(Platform)\$(ToolchainName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup>
@@ -27,6 +29,7 @@
<TargetExt>.a</TargetExt>
</PropertyGroup>
+
<Import Project="$(VCTargetsPath)\NaCl\NaCl.Paths.default.props" />
<Import Project="$(VCTargetsPath)\NaCl\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\NaCl\ImportAfter')" />
</Project>

Powered by Google App Engine
This is Rietveld 408576698