visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.props - Issue 10826232: NaCl VS Add-in User Changed Properties Fix

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.targets » ('j') | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1	1

2 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	2 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

3 <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.props" Conditi on="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" />	3 <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.props" Conditi on="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" />

4 <Import Condition="(exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\$ (PlatformToolset)\Microsoft.Cpp.NaCl.$(PlatformToolset).props'))" Project="$(VCT argetsPath)\Platforms\NaCl\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.NaC l.$(PlatformToolset).props"/>	4 <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath )\Platforms\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newl ib.props'))" Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_n ewlib\Microsoft.Cpp.NaCl.win_x86_newlib.props"/>

5	5 <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_glib c\Microsoft.Cpp.NaCl.win_x86_glibc.props"/>

	6

6 <PropertyGroup>	7 <PropertyGroup>

7 <DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</De buggerFlavor>	8 <DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</De buggerFlavor>

8 </PropertyGroup>	9 </PropertyGroup>

9	10

10 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.Toolset.default.props" / >	11 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.Toolset.default.props" / >

11	12

12 <PropertyGroup>	13 <PropertyGroup>

13 <IgnoreImportLibrary>true</IgnoreImportLibrary>	14 <IgnoreImportLibrary>true</IgnoreImportLibrary>

14 <GenerateManifest>false</GenerateManifest>	15 <GenerateManifest>false</GenerateManifest>

15 </PropertyGroup>	16 </PropertyGroup>

16	17

17 <PropertyGroup Condition="'$(ConfigurationType)' == 'Application'">	18 <PropertyGroup Condition="'$(ConfigurationType)' == 'Application'">

18 <LinkCompiled>true</LinkCompiled>	19 <LinkCompiled>true</LinkCompiled>

19 <TargetExt>.nexe</TargetExt>	20 <TargetExt>.nexe</TargetExt>

20 </PropertyGroup>	21 </PropertyGroup>

21	22

22 <PropertyGroup Condition="'$(ConfigurationType)' == 'DynamicLibrary'">	23 <PropertyGroup Condition="'$(ConfigurationType)' == 'DynamicLibrary'">

23 <LinkCompiled>true</LinkCompiled>	24 <LinkCompiled>true</LinkCompiled>

24 <TargetExt>.so</TargetExt>	25 <TargetExt>.so</TargetExt>

25 </PropertyGroup>	26 </PropertyGroup>

26	27

27 <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">	28 <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">

28 <LibCompiled>true</LibCompiled>	29 <LibCompiled>true</LibCompiled>

29 <TargetExt>.a</TargetExt>	30 <TargetExt>.a</TargetExt>

30 </PropertyGroup>	31 </PropertyGroup>

31	32

32 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.Paths.default.props" />	33 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.Paths.default.props" />

33 <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportAfter\*.props" Conditio n="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportAfter')" />	34 <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportAfter\*.props" Conditio n="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportAfter')" />

34 </Project>	35 </Project>

OLD	NEW