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

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

Issue 10826232: NaCl VS Add-in User Changed Properties Fix (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 4 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
Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props
index f1068a969f2aeedb9c9c4a0efe84e4f9658ae9d3..ec6972a721e53c53eb3b12772317182daacda801 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props
@@ -1,8 +1,9 @@

<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" />
- <Import Condition="(exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.NaCl.$(PlatformToolset).props'))" Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.NaCl.$(PlatformToolset).props"/>
-
+ <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props'))" Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props"/>
+ <Import Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props'))" Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props"/>
+
<PropertyGroup>
<DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>

Powered by Google App Engine
This is Rietveld 408576698