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

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets

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 | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuil d/2003"> 1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuil d/2003">
2 2
3 <PropertyGroup> 3 <PropertyGroup>
4 <UseDefaultProjectTools>false</UseDefaultProjectTools> 4 <UseDefaultProjectTools>false</UseDefaultProjectTools>
5 <UseDefaultPropertyPageSchemas>false</UseDefaultPropertyPageSchemas> 5 <UseDefaultPropertyPageSchemas>false</UseDefaultPropertyPageSchemas>
6 <UseDefaultGeneralPropertyPageSchema>false</UseDefaultGeneralPropertyPageSch ema> 6 <UseDefaultGeneralPropertyPageSchema>false</UseDefaultGeneralPropertyPageSch ema>
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <!-- Property pages --> 9 <!-- Property pages -->
10 10
(...skipping 26 matching lines...) Expand all
37 </PropertyPageSchema> 37 </PropertyPageSchema>
38 38
39 <!-- Switch view between project property based directories and environment variables --> 39 <!-- Switch view between project property based directories and environment variables -->
40 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_directories.xm l" /> 40 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_directories.xm l" />
41 41
42 <!-- Non-Utility project property pages --> 42 <!-- Non-Utility project property pages -->
43 <PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility'" Include= " 43 <PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility'" Include= "
44 $(VCTargetsPath)\NaCl\Props\nacl_compile.xml; 44 $(VCTargetsPath)\NaCl\Props\nacl_compile.xml;
45 $(VCTargetsPath)$(LangID)\custom_build_step.xml; 45 $(VCTargetsPath)$(LangID)\custom_build_step.xml;
46 "/> 46 "/>
47 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Cond ition="'$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'Dyn amicLibrary'" /> 47 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\pnacl_link.xml" Con dition="'$(Platform)' == 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" />
48 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Cond ition="'$(Platform)' != 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" />
48 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml" Condi tion="'$(ConfigurationType)' == 'StaticLibrary'" /> 49 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml" Condi tion="'$(ConfigurationType)' == 'StaticLibrary'" />
49 </ItemGroup> 50 </ItemGroup>
50 51
51 <ItemGroup> 52 <ItemGroup>
52 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_general.xml"> 53 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_general.xml">
53 <Context>Project</Context> 54 <Context>Project</Context>
54 </PropertyPageSchema> 55 </PropertyPageSchema>
55 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_general_ps.xml "> 56 <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_general_ps.xml ">
56 <Context>PropertySheet</Context> 57 <Context>PropertySheet</Context>
57 </PropertyPageSchema> 58 </PropertyPageSchema>
58 </ItemGroup> 59 </ItemGroup>
59 60
60 <!-- Tools that show up in the IDE property pages for exe and dll projects --> 61 <!-- Tools that show up in the IDE property pages for exe and dll projects -->
61 <ItemGroup Condition="('$(ConfigurationType)' == 'Application' or '$(Configura tionType)' == 'DynamicLibrary')"> 62 <ItemGroup Condition="('$(ConfigurationType)' == 'Application' or '$(Configura tionType)' == 'DynamicLibrary')">
62 <ProjectTools Include="Link"/> 63 <ProjectTools Include="Link"/>
63 <ProjectTools Include="CustomBuildStep"/> 64 <ProjectTools Include="CustomBuildStep"/>
64 </ItemGroup> 65 </ItemGroup>
65 66
66 <!-- Tools that show up in the IDE property pages for lib project--> 67 <!-- Tools that show up in the IDE property pages for lib project-->
67 <ItemGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'"> 68 <ItemGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
68 <ProjectTools Include="Lib"/> 69 <ProjectTools Include="Lib"/>
69 <ProjectTools Include="CustomBuildStep"/> 70 <ProjectTools Include="CustomBuildStep"/>
70 </ItemGroup> 71 </ItemGroup>
71 72
72 </Project> 73 </Project>
OLDNEW
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698