visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props - Issue 11266051: Add PNaCl support for VS addin.

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props

Issue 11266051: Add PNaCl support for VS addin. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: fix nits and tests 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Props/pnacl_link.xml ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.props" Condition="Exists ('$(VCTargetsPath)\NaCl\ImportBefore')" />	2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.props" Condition="Exists ('$(VCTargetsPath)\NaCl\ImportBefore')" />

3 <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath )\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props') )" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp. NaCl.win_x86_newlib.props"/>	3 <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath )\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props') )" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp. NaCl.win_x86_newlib.props"/>

4 <Import Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath) \NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl .win_x86_glibc.props"/>	4 <Import Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath) \NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl .win_x86_glibc.props"/>

5	5

6 <PropertyGroup>	6 <PropertyGroup>

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

8 </PropertyGroup>	8 </PropertyGroup>

9	9

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

11

12 <PropertyGroup>	10 <PropertyGroup>

13 <IgnoreImportLibrary>true</IgnoreImportLibrary>	11 <IgnoreImportLibrary>true</IgnoreImportLibrary>

14 <GenerateManifest>false</GenerateManifest>	12 <GenerateManifest>false</GenerateManifest>

15 </PropertyGroup>	13 </PropertyGroup>

16	14

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

18 <LinkCompiled>true</LinkCompiled>	16 <LinkCompiled>true</LinkCompiled>

19 <TargetExt>.nexe</TargetExt>	17 <TargetExt>.nexe</TargetExt>

20 </PropertyGroup>	18 </PropertyGroup>

21	19

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

23 <LinkCompiled>true</LinkCompiled>	21 <LinkCompiled>true</LinkCompiled>

24 <TargetExt>.so</TargetExt>	22 <TargetExt>.so</TargetExt>

25 </PropertyGroup>	23 </PropertyGroup>

26	24

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

28 <LibCompiled>true</LibCompiled>	26 <LibCompiled>true</LibCompiled>

29 <TargetExt>.a</TargetExt>	27 <TargetExt>.a</TargetExt>

30 </PropertyGroup>	28 </PropertyGroup>

31	29

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

33 <Import Project="$(VCTargetsPath)\NaCl\ImportAfter\*.props" Condition="Exists( '$(VCTargetsPath)\NaCl\ImportAfter')" />	31 <Import Project="$(VCTargetsPath)\NaCl\ImportAfter\*.props" Condition="Exists( '$(VCTargetsPath)\NaCl\ImportAfter')" />

34 </Project>	32 </Project>

OLD	NEW