Fix output names

visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Props/nacl_general.xml

 <?xml version="1.0" encoding="utf-8"?>
 
 <Rule
       Name="ConfigurationGeneral"
       DisplayName="General"
       PageTemplate="generic"
       Description="General"
       xmlns="http://schemas.microsoft.com/build/2009/properties">
   <Rule.Categories>
     <Category Name="General" DisplayName="General" Description="General" />
@@ skipping 38 matching lines @@
     </StringProperty.DataSource>
   </StringProperty>
 
   <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="NativeClient">
     <EnumValue Name="newlib" DisplayName="newlib" />
     <EnumValue Name="glibc" DisplayName="glibc" />
   </EnumProperty>
 
   <StringProperty Name="OutDir" DisplayName="Output Directory"
                   Description="Specifies a relative path to the output file directory; can include environment variables."
-                  Category="General" Default="$(SolutionDir)$(Configuration)\"
+                  Category="General" Default="$(SolutionDir)\$(Platform)\$(Toolchain)\$(Configuration)\"
                   Subtype="folder"
                   F1Keyword="VC.Project.VCConfiguration.OutputDirectory">
                   <StringProperty.DataSource>
                      <DataSource Persistence="ProjectFile" Label="" />
                   </StringProperty.DataSource>
   </StringProperty>
 
   <StringProperty Name="IntDir" DisplayName="Intermediate Directory"
                   Description="Specifies a relative path to the intermediate file directory; can include environment variables."
                   Category="General" Default="$(Configuration)\"
                   Subtype="folder"
                   F1Keyword="VC.Project.VCConfiguration.IntermediateDirectory">
                   <StringProperty.DataSource>
                      <DataSource Persistence="ProjectFile" Label="" />
                   </StringProperty.DataSource>
   </StringProperty>
 
   <StringProperty Name="TargetName" DisplayName="Target Name"
                   Description="Specifies a file name that this project will generate."
                   F1Keyword="VC.Project.VCConfiguration.TargetName"
-                  Category="General" Default="$(ProjectName)"
+                  Category="General" Default="$(ProjectName)_$(TargetArchitecture)"

[binji, 2012/10/10 22:23:22]

add comment about removing target architecture from targetname

                   >
                   <StringProperty.DataSource>
                      <DataSource Persistence="ProjectFile" Label="" />
                   </StringProperty.DataSource>
   </StringProperty>
 
   <StringProperty Name="TargetExt" DisplayName="Target Extension"
                   Description="Specifies a file extension that this project will generate. (Example: .exe or .dll)"
                   F1Keyword="VC.Project.VCConfiguration.TargetExt"
                   Category="General"
@@ skipping 46 matching lines @@
                Description="Common Language Runtime Support (/clr)"/>
     <EnumValue Name="Pure" DisplayName="Pure MSIL Common Language Runtime Support (/clr:pure)"
                Description="Pure MSIL Common Language Runtime Support (/clr:pure)" />
     <EnumValue Name="Safe" DisplayName="Safe MSIL Common Language Runtime Support (/clr:safe)"
                Description="Safe MSIL Common Language Runtime Support (/clr:safe)" />
     <EnumValue Name="OldSyntax" DisplayName="Common Language Runtime Support, Old Syntax (/clr:oldSyntax)"
                Description="Common Language Runtime Support, Old Syntax (/clr:oldSyntax)" />
   </EnumProperty>
 
 </Rule>