visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props - Issue 11358127: Honor toolchain name in output folder

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

Issue 11358127: Honor toolchain name in output folder (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: 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 | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props » ('j') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props » ('J')
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 <IntDir Condition="'$(IntDir)'=='DUMMY'">$(Platform)\$(ToolchainName)\$(Conf iguration)\</IntDir>

	9 <OutDir Condition="'$(OutDir)'=='DUMMY'">$(ProjectDir)$(Platform)\$(Toolchai nName)\$(Configuration)\</OutDir>

8 </PropertyGroup>	10 </PropertyGroup>

9	11

10 <PropertyGroup>	12 <PropertyGroup>

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

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

13 </PropertyGroup>	15 </PropertyGroup>

14	16

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

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

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

18 </PropertyGroup>	20 </PropertyGroup>

19	21

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

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

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

23 </PropertyGroup>	25 </PropertyGroup>

24	26

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

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

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

28 </PropertyGroup>	30 </PropertyGroup>

29	31

	32

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

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

32 </Project>	35 </Project>

OLD	NEW