[VS AddIn] Fix default library paths.

visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props

Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props
index 4467973a58c986aabe8d52b7f506b2f4c41f210c..16533fe6a344ee011fd6f6fb66930d5715b14266 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props
@@ -22,8 +22,10 @@
 
     <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(PATH);</ExecutablePath>
     <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;</IncludePath>
-    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='i686'">$(VSNaClSDKRoot)lib32;</LibraryPath>
-    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='x86_64'">$(VSNaClSDKRoot)lib;</LibraryPath>
+    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='i686'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_32\$(Configuration);</LibraryPath>

[binji, 2013/11/19 21:57:16]

I don't fully understand this, but it looks like it is only added if LibraryPath
is not defined. Is that what we want? I figured we would always want to add that
path.

[Sam Clegg, 2013/11/19 23:21:24]

This is just setting the default library path, yes.

This is how VS does this generally.  For example the default include
and lib paths point to the visual studio libs and headers.  If you
remove these paths that is your prerogative.  I think it makes sense
to mimic them.

+    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='x86_64'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_64\$(Configuration);</LibraryPath>
+    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='arm'">$(VSNaClSDKRoot)lib\$(ToolchainName)_arm\$(Configuration);</LibraryPath>
+    <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='pnacl'">$(VSNaClSDKRoot)lib\pnacl\$(Configuration);</LibraryPath>
 
   </PropertyGroup>
 </Project>