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

Unified 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, 2 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
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets
index fb5f5d1033259f3124b63f4e0b3cfa88e5e21692..d08d25f5147dbac41b5690e4e0137ca9c1b80cc7 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets
@@ -44,7 +44,8 @@
$(VCTargetsPath)\NaCl\Props\nacl_compile.xml;
$(VCTargetsPath)$(LangID)\custom_build_step.xml;
"/>
- <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Condition="'$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary'" />
+ <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\pnacl_link.xml" Condition="'$(Platform)' == 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" />
+ <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Condition="'$(Platform)' != 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" />
<PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml" Condition="'$(ConfigurationType)' == 'StaticLibrary'" />
</ItemGroup>
« 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