visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props - Issue 11358127: Honor toolchain name in output folder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.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.default.props

diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props

index cd4b1ec90b21b5362cbac42882d2ae79097a8d36..0b341d82a379921bf1ad7d70f6ba0e30f191f76e 100644

--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props

+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props

@@ -7,10 +7,15 @@

<ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>

<TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchitecture)</TargetName>

<ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName>

<IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>

- <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(ToolchainName)\$(Configuration)\</IntDir>

- <OutDir Condition="'$(OutDir)'==''">$(ProjectDir)$(Platform)\$(ToolchainName)\$(Configuration)\</OutDir>

+ <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default.props file

+ from setting them. This allows us to set them to thier real default values in the

binji 2012/11/06 22:33:39 sp: their

+ .props file. By which time the user settings for ToolchainName in the vcproj file

+ will have been set. If we try to use $(ToolchainName) here it will always evaluate

+ to newlib. -->

+ <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMMY</IntDir>

+ <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir>

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props ('k') | no next file » | no next file with comments »